Author: hans
Date: Thu Jan 12 17:30:04 2017
New Revision: 291860
URL: http://llvm.org/viewvc/llvm-project?rev=291860&view=rev
Log:
Merging r291850 and r291853:
------------------------------------------------------------------------
r291850 | chandlerc | 2017-01-12 14:40:13 -0800 (Thu, 12 Jan 2017) | 9 lines
Address review comments on r290392:
- Don't break using '-mllvm -disable-llvm-optzns' (yet).
- Don't add support for '-mllvm -disable-llvm-passes'.
This is important for LLVM 4 as we haven't yet really told folks this is
coming. I'll add release notes about this.
I've also added some explicit testing of this so its more obvious what
is happening here.
------------------------------------------------------------------------
------------------------------------------------------------------------
r291853 | chandlerc | 2017-01-12 14:48:28 -0800 (Thu, 12 Jan 2017) | 1 line
Fix two test cases I missed updating in r291850. Sorry for the noise.
------------------------------------------------------------------------
Added:
cfe/branches/release_40/test/Driver/disable-llvm.c
- copied unchanged from r291850, cfe/trunk/test/Driver/disable-llvm.c
Modified:
cfe/branches/release_40/ (props changed)
cfe/branches/release_40/lib/Driver/Tools.cpp
cfe/branches/release_40/test/CodeGen/always_inline.c
cfe/branches/release_40/test/Driver/cl-options.c
cfe/branches/release_40/test/Profile/gcc-flag-compatibility.c
Propchange: cfe/branches/release_40/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 12 17:30:04 2017
@@ -1,3 +1,4 @@
/cfe/branches/type-system-rewrite:134693-134817
+/cfe/trunk:291850,291853
/cfe/trunk/test:170344
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_40/lib/Driver/Tools.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/lib/Driver/Tools.cpp?rev=291860&r1=291859&r2=291860&view=diff
==============================================================================
--- cfe/branches/release_40/lib/Driver/Tools.cpp (original)
+++ cfe/branches/release_40/lib/Driver/Tools.cpp Thu Jan 12 17:30:04 2017
@@ -6431,11 +6431,13 @@ void Clang::ConstructJob(Compilation &C,
A->claim();
// We translate this by hand to the -cc1 argument, since nightly test uses
- // it and developers have been trained to spell it with -mllvm.
- if (StringRef(A->getValue(0)) == "-disable-llvm-passes") {
- CmdArgs.push_back("-disable-llvm-passes");
- } else
+ // it and developers have been trained to spell it with -mllvm. Both
+ // spellings are now deprecated and should be removed.
+ if (StringRef(A->getValue(0)) == "-disable-llvm-optzns") {
+ CmdArgs.push_back("-disable-llvm-optzns");
+ } else {
A->render(Args, CmdArgs);
+ }
}
// With -save-temps, we want to save the unoptimized bitcode output from the
Modified: cfe/branches/release_40/test/CodeGen/always_inline.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/CodeGen/always_inline.c?rev=291860&r1=291859&r2=291860&view=diff
==============================================================================
--- cfe/branches/release_40/test/CodeGen/always_inline.c (original)
+++ cfe/branches/release_40/test/CodeGen/always_inline.c Thu Jan 12 17:30:04
2017
@@ -1,7 +1,7 @@
// RUN: %clang -emit-llvm -S -o %t %s
// RUN: not grep '@f0' %t
// RUN: not grep 'call ' %t
-// RUN: %clang -mllvm -disable-llvm-passes -emit-llvm -S -o %t %s
+// RUN: %clang -Xclang -disable-llvm-passes -emit-llvm -S -o %t %s
// RUN: grep '@f0' %t | count 2
//static int f0() {
Modified: cfe/branches/release_40/test/Driver/cl-options.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/Driver/cl-options.c?rev=291860&r1=291859&r2=291860&view=diff
==============================================================================
--- cfe/branches/release_40/test/Driver/cl-options.c (original)
+++ cfe/branches/release_40/test/Driver/cl-options.c Thu Jan 12 17:30:04 2017
@@ -535,7 +535,7 @@
// RUN: -fno-ms-compatibility \
// RUN: -fms-extensions \
// RUN: -fno-ms-extensions \
-// RUN: -mllvm -disable-llvm-passes \
+// RUN: -Xclang -disable-llvm-passes \
// RUN: -resource-dir asdf \
// RUN: -resource-dir=asdf \
// RUN: -Wunused-variable \
Modified: cfe/branches/release_40/test/Profile/gcc-flag-compatibility.c
URL:
http://llvm.org/viewvc/llvm-project/cfe/branches/release_40/test/Profile/gcc-flag-compatibility.c?rev=291860&r1=291859&r2=291860&view=diff
==============================================================================
--- cfe/branches/release_40/test/Profile/gcc-flag-compatibility.c (original)
+++ cfe/branches/release_40/test/Profile/gcc-flag-compatibility.c Thu Jan 12
17:30:04 2017
@@ -18,14 +18,14 @@
// RUN: rm -rf %t.dir
// RUN: mkdir -p %t.dir/some/path
// RUN: llvm-profdata merge %S/Inputs/gcc-flag-compatibility.proftext -o
%t.dir/some/path/default.profdata
-// RUN: %clang %s -o - -mllvm -disable-llvm-passes -emit-llvm -S
-fprofile-use=%t.dir/some/path | FileCheck -check-prefix=PROFILE-USE-2 %s
+// RUN: %clang %s -o - -Xclang -disable-llvm-passes -emit-llvm -S
-fprofile-use=%t.dir/some/path | FileCheck -check-prefix=PROFILE-USE-2 %s
// PROFILE-USE-2: = !{!"branch_weights", i32 101, i32 2}
// Check that -fprofile-use=some/path/file.prof reads some/path/file.prof
// RUN: rm -rf %t.dir
// RUN: mkdir -p %t.dir/some/path
// RUN: llvm-profdata merge %S/Inputs/gcc-flag-compatibility.proftext -o
%t.dir/some/path/file.prof
-// RUN: %clang %s -o - -mllvm -disable-llvm-passes -emit-llvm -S
-fprofile-use=%t.dir/some/path/file.prof | FileCheck
-check-prefix=PROFILE-USE-3 %s
+// RUN: %clang %s -o - -Xclang -disable-llvm-passes -emit-llvm -S
-fprofile-use=%t.dir/some/path/file.prof | FileCheck
-check-prefix=PROFILE-USE-3 %s
// PROFILE-USE-3: = !{!"branch_weights", i32 101, i32 2}
int X = 0;
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
