Skip to content

release/20.x: [clang] Handle f(no-)strict-overflow, f(no-)wrapv, f(no-)wrapv-pointer like gcc (#126524) #126535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 11, 2025
Merged

release/20.x: [clang] Handle f(no-)strict-overflow, f(no-)wrapv, f(no-)wrapv-pointer like gcc (#126524) #126535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 33 additions & 15 deletions clang/lib/Driver/ToolChains/CommonArgs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3098,21 +3098,39 @@ bool tools::shouldRecordCommandLine(const ToolChain &TC,

void tools::renderCommonIntegerOverflowOptions(const ArgList &Args,
ArgStringList &CmdArgs) {
// -fno-strict-overflow implies -fwrapv if it isn't disabled, but
// -fstrict-overflow won't turn off an explicitly enabled -fwrapv.
bool StrictOverflow = Args.hasFlag(options::OPT_fstrict_overflow,
options::OPT_fno_strict_overflow, true);
if (Arg *A = Args.getLastArg(options::OPT_fwrapv, options::OPT_fno_wrapv)) {
if (A->getOption().matches(options::OPT_fwrapv))
CmdArgs.push_back("-fwrapv");
} else if (!StrictOverflow) {
CmdArgs.push_back("-fwrapv");
bool use_fwrapv = false;
bool use_fwrapv_pointer = false;
for (const Arg *A : Args.filtered(
options::OPT_fstrict_overflow, options::OPT_fno_strict_overflow,
options::OPT_fwrapv, options::OPT_fno_wrapv,
options::OPT_fwrapv_pointer, options::OPT_fno_wrapv_pointer)) {
A->claim();
switch (A->getOption().getID()) {
case options::OPT_fstrict_overflow:
use_fwrapv = false;
use_fwrapv_pointer = false;
break;
case options::OPT_fno_strict_overflow:
use_fwrapv = true;
use_fwrapv_pointer = true;
break;
case options::OPT_fwrapv:
use_fwrapv = true;
break;
case options::OPT_fno_wrapv:
use_fwrapv = false;
break;
case options::OPT_fwrapv_pointer:
use_fwrapv_pointer = true;
break;
case options::OPT_fno_wrapv_pointer:
use_fwrapv_pointer = false;
break;
}
}
if (Arg *A = Args.getLastArg(options::OPT_fwrapv_pointer,
options::OPT_fno_wrapv_pointer)) {
if (A->getOption().matches(options::OPT_fwrapv_pointer))
CmdArgs.push_back("-fwrapv-pointer");
} else if (!StrictOverflow) {

if (use_fwrapv)
CmdArgs.push_back("-fwrapv");
if (use_fwrapv_pointer)
CmdArgs.push_back("-fwrapv-pointer");
}
}
24 changes: 12 additions & 12 deletions clang/test/Driver/clang_wrapv_opts.c
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
// RUN: %clang -### -S -fwrapv -fno-wrapv -fwrapv -Werror %s 2>&1 | FileCheck -check-prefix=CHECK1 %s
// CHECK1: "-fwrapv"
//

// RUN: %clang -### -S -fwrapv-pointer -fno-wrapv-pointer -fwrapv-pointer -Werror %s 2>&1 | FileCheck -check-prefix=CHECK1-POINTER %s
// CHECK1-POINTER: "-fwrapv-pointer"
//

// RUN: %clang -### -S -fstrict-overflow -fno-strict-overflow -Werror %s 2>&1 | FileCheck -check-prefix=CHECK2 %s
// CHECK2: "-fwrapv"{{.*}}"-fwrapv-pointer"
//

// RUN: %clang -### -S -fwrapv -fstrict-overflow -Werror -Werror %s 2>&1 | FileCheck -check-prefix=CHECK3 %s --implicit-check-not="-fwrapv-pointer"
// CHECK3: "-fwrapv"
//
// CHECK3-NOT: "-fwrapv"

// RUN: %clang -### -S -fwrapv-pointer -fstrict-overflow -Werror %s 2>&1 | FileCheck -check-prefix=CHECK3-POINTER %s --implicit-check-not="-fwrapv"
// CHECK3-POINTER: "-fwrapv-pointer"
//
// RUN: %clang -### -S -fno-wrapv -fno-strict-overflow -Werror %s 2>&1 | FileCheck -check-prefix=CHECK4 %s --implicit-check-not="-fwrapv"
// CHECK4: "-fwrapv-pointer"
//
// RUN: %clang -### -S -fno-wrapv-pointer -fno-strict-overflow -Werror %s 2>&1 | FileCheck -check-prefix=CHECK4-POINTER %s --implicit-check-not="-fwrapv-pointer"
// CHECK4-POINTER: "-fwrapv"
// CHECK3-POINTER-NOT: "-fwrapv-pointer"

// RUN: %clang -### -S -fno-wrapv -fno-strict-overflow -fno-wrapv-pointer -Werror %s 2>&1 | FileCheck -check-prefix=CHECK4 %s --implicit-check-not="-fwrapv-pointer"
// CHECK4: "-fwrapv"

// RUN: %clang -### -S -fno-wrapv-pointer -fno-strict-overflow -fno-wrapv -Werror %s 2>&1 | FileCheck -check-prefix=CHECK4-POINTER %s --implicit-check-not="-fwrapv"
// CHECK4-POINTER: "-fwrapv-pointer"
Loading