[llvm-branch-commits] [clang] e84852b - Add ability to turn off -fpch-instantiate-templates in clang-cl
Author: Shivanshu Goyal
Date: 2020-10-07T12:03:44+02:00
New Revision: e84852be644d34867a604997fd328bf411b1977d
URL:
https://github.com/llvm/llvm-project/commit/e84852be644d34867a604997fd328bf411b1977d
DIFF:
https://github.com/llvm/llvm-project/commit/e84852be644d34867a604997fd328bf411b1977d.diff
LOG: Add ability to turn off -fpch-instantiate-templates in clang-cl
A lot of our code building with clang-cl.exe using Clang 11 was failing with
the following 2 type of errors:
1. explicit specialization of 'foo' after instantiation
2. no matching function for call to 'bar'
Note that we also use -fdelayed-template-parsing in our builds.
I tried pretty hard to get a small repro for these failures, but couldn't. So
there is some subtle edge case in the -fpch-instantiate-templates feature
introduced by this change: https://reviews.llvm.org/D69585
When I tried turning this off using -fno-pch-instantiate-templates, builds
would silently fail with the same error without any indication that
-fno-pch-instantiate-templates was being ignored by the compiler. Then I
realized this "no" option wasn't actually working when I ran Clang under a
debugger.
Differential revision: https://reviews.llvm.org/D88680
(cherry picked from commit 66e4f07198761bbb4dcd55235024c1081ed15c75)
Added:
clang/test/Driver/pch-instantiate-templates.c
Modified:
clang/include/clang/Driver/Options.td
clang/lib/Driver/ToolChains/Clang.cpp
Removed:
diff --git a/clang/include/clang/Driver/Options.td
b/clang/include/clang/Driver/Options.td
index f818acb39d51..966cb907b7e2 100644
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -1435,11 +1435,11 @@ def fno_pch_validate_input_files_content:
Group, Flags<[DriverOption]>;
def fpch_instantiate_templates:
Flag <["-"], "fpch-instantiate-templates">,
- Group, Flags<[CC1Option]>,
+ Group, Flags<[CC1Option, CoreOption]>,
HelpText<"Instantiate templates already while building a PCH">;
def fno_pch_instantiate_templates:
Flag <["-"], "fno-pch-instantiate-templates">,
- Group, Flags<[CC1Option]>;
+ Group, Flags<[CC1Option, CoreOption]>;
defm pch_codegen: OptInFFlag<"pch-codegen", "Generate ", "Do not generate ",
"code for uses of this PCH that assumes an explicit object file will be
built for the PCH">;
defm pch_debuginfo: OptInFFlag<"pch-debuginfo", "Generate ", "Do not generate
",
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp
b/clang/lib/Driver/ToolChains/Clang.cpp
index f0a5451322aa..af4bcf951e6c 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1197,7 +1197,11 @@ void Clang::AddPreprocessingOptions(Compilation &C,
const JobAction &JA,
if (YcArg && JA.getKind() >= Action::PrecompileJobClass &&
JA.getKind() <= Action::AssembleJobClass) {
CmdArgs.push_back(Args.MakeArgString("-building-pch-with-obj"));
- CmdArgs.push_back(Args.MakeArgString("-fpch-instantiate-templates"));
+ // -fpch-instantiate-templates is the default when creating
+ // precomp using /Yc
+ if (Args.hasFlag(options::OPT_fpch_instantiate_templates,
+ options::OPT_fno_pch_instantiate_templates, true))
+CmdArgs.push_back(Args.MakeArgString("-fpch-instantiate-templates"));
}
if (YcArg || YuArg) {
StringRef ThroughHeader = YcArg ? YcArg->getValue() : YuArg->getValue();
diff --git a/clang/test/Driver/pch-instantiate-templates.c
b/clang/test/Driver/pch-instantiate-templates.c
new file mode 100644
index ..b0f7f3473993
--- /dev/null
+++ b/clang/test/Driver/pch-instantiate-templates.c
@@ -0,0 +1,13 @@
+// CL driver test cases
+// RUN: %clang_cl -### /Yc /Fpfoo.pch /Fofoo.obj -- %s 2>&1 | FileCheck
--check-prefix=CLANG_CL_YC %s
+// RUN: %clang_cl -### /Yc /Fpfoo.pch /Fofoo.obj
-fno-pch-instantiate-templates -- %s 2>&1 | FileCheck
--check-prefix=CLANG_CL_YC_DISABLE %s
+
+// CLANG_CL_YC: "-fpch-instantiate-templates"
+// CLANG_CL_YC_DISABLE-NOT: "-fpch-instantiate-templates"
+
+// GCC driver test cases
+// RUN: %clang -### -x c-header %s -o %t/foo.pch 2>&1 | FileCheck
-check-prefix=GCC_DEFAULT %s
+// RUN: %clang -### -x c-header %s -o %t/foo.pch -fpch-instantiate-templates
2>&1 | FileCheck -check-prefix=GCC_DEFAULT_ENABLE %s
+
+// GCC_DEFAULT-NOT: "-fpch-instantiate-templates"
+// GCC_DEFAULT_ENABLE: "-fpch-instantiate-templates"
___
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
[llvm-branch-commits] [llvm] 176249b - [CodeGen][TailDuplicator] Don't duplicate blocks with INLINEASM_BR
Author: Bill Wendling
Date: 2020-10-07T12:10:48+02:00
New Revision: 176249bd6732a8044d457092ed932768724a6f06
URL:
https://github.com/llvm/llvm-project/commit/176249bd6732a8044d457092ed932768724a6f06
DIFF:
https://github.com/llvm/llvm-project/commit/176249bd6732a8044d457092ed932768724a6f06.diff
LOG: [CodeGen][TailDuplicator] Don't duplicate blocks with INLINEASM_BR
Tail duplication of a block with an INLINEASM_BR may result in a PHI
node on the indirect branch. This is okay, but it also introduces a copy
for that PHI node *after* the INLINEASM_BR, which is not okay.
See: https://github.com/ClangBuiltLinux/linux/issues/1125
Differential Revision: https://reviews.llvm.org/D88823
(cherry picked from commit d2c61d2bf9bd1efad49acba2f2751112522686aa)
Added:
llvm/test/CodeGen/X86/tail-dup-asm-goto.ll
Modified:
llvm/lib/CodeGen/TailDuplicator.cpp
Removed:
diff --git a/llvm/lib/CodeGen/TailDuplicator.cpp
b/llvm/lib/CodeGen/TailDuplicator.cpp
index bd554189f12b..f9773f74a7bd 100644
--- a/llvm/lib/CodeGen/TailDuplicator.cpp
+++ b/llvm/lib/CodeGen/TailDuplicator.cpp
@@ -627,6 +627,14 @@ bool TailDuplicator::shouldTailDuplicate(bool IsSimple,
if (PreRegAlloc && MI.isCall())
return false;
+// TailDuplicator::appendCopies will erroneously place COPYs after
+// INLINEASM_BR instructions after 4b0aa5724fea, which demonstrates the
same
+// bug that was fixed in f7a53d82c090.
+// FIXME: Use findPHICopyInsertPoint() to find the correct insertion point
+//for the COPY when replacing PHIs.
+if (MI.getOpcode() == TargetOpcode::INLINEASM_BR)
+ return false;
+
if (MI.isBundle())
InstrCount += MI.getBundleSize();
else if (!MI.isPHI() && !MI.isMetaInstruction())
diff --git a/llvm/test/CodeGen/X86/tail-dup-asm-goto.ll
b/llvm/test/CodeGen/X86/tail-dup-asm-goto.ll
new file mode 100644
index ..77aa3adf0fc6
--- /dev/null
+++ b/llvm/test/CodeGen/X86/tail-dup-asm-goto.ll
@@ -0,0 +1,61 @@
+; NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py
+; RUN: llc -mtriple=x86_64-linux -stop-after=early-tailduplication < %s |
FileCheck %s
+
+; Ensure that we don't duplicate a block with an "INLINEASM_BR" instruction
+; during code gen.
+declare void @foo()
+
+define i8* @test1(i8** %arg1, i8* %arg2) {
+ ; CHECK-LABEL: name: test1
+ ; CHECK: bb.0.bb:
+ ; CHECK: successors: %bb.1(0x5000), %bb.2(0x3000)
+ ; CHECK: liveins: $rdi, $rsi
+ ; CHECK: [[COPY:%[0-9]+]]:gr64 = COPY $rsi
+ ; CHECK: [[COPY1:%[0-9]+]]:gr64 = COPY $rdi
+ ; CHECK: [[MOV64rm:%[0-9]+]]:gr64 = MOV64rm [[COPY1]], 1, $noreg, 0,
$noreg :: (load 8 from %ir.arg1)
+ ; CHECK: [[SUB64rr:%[0-9]+]]:gr64 = SUB64rr [[MOV64rm]], [[COPY]],
implicit-def $eflags
+ ; CHECK: JCC_1 %bb.2, 4, implicit $eflags
+ ; CHECK: JMP_1 %bb.1
+ ; CHECK: bb.1.bb100:
+ ; CHECK: successors: %bb.3(0x8000)
+ ; CHECK: MOV64mi32 [[COPY1]], 1, $noreg, 0, $noreg, 0 :: (store 8 into
%ir.arg1)
+ ; CHECK: JMP_1 %bb.3
+ ; CHECK: bb.2.bb106:
+ ; CHECK: successors: %bb.3(0x8000)
+ ; CHECK: ADJCALLSTACKDOWN64 0, 0, 0, implicit-def dead $rsp, implicit-def
dead $eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
+ ; CHECK: CALL64pcrel32 @foo, csr_64, implicit $rsp, implicit $ssp,
implicit-def $rsp, implicit-def $ssp
+ ; CHECK: ADJCALLSTACKUP64 0, 0, implicit-def dead $rsp, implicit-def dead
$eflags, implicit-def dead $ssp, implicit $rsp, implicit $ssp
+ ; CHECK: bb.3.bb110:
+ ; CHECK: successors: %bb.5(0x8000), %bb.4(0x)
+ ; CHECK: [[PHI:%[0-9]+]]:gr64 = PHI [[COPY]], %bb.2, [[MOV64rm]], %bb.1
+ ; CHECK: INLINEASM_BR &"#$0 $1 $2", 9 /* sideeffect mayload attdialect */,
13 /* imm */, 42, 13 /* imm */, 0, 13 /* imm */, blockaddress(@test1,
%ir-block.bb17.i.i.i), 12 /* clobber */, implicit-def early-clobber $df, 12 /*
clobber */, implicit-def early-clobber $fpsw, 12 /* clobber */, implicit-def
early-clobber $eflags
+ ; CHECK: JMP_1 %bb.5
+ ; CHECK: bb.4.bb17.i.i.i (address-taken):
+ ; CHECK: successors: %bb.5(0x8000)
+ ; CHECK: bb.5.kmem_cache_has_cpu_partial.exit:
+ ; CHECK: $rax = COPY [[PHI]]
+ ; CHECK: RET 0, $rax
+bb:
+ %i28.i = load i8*, i8** %arg1, align 8
+ %if = icmp ne i8* %i28.i, %arg2
+ br i1 %if, label %bb100, label %bb106
+
+bb100:; preds = %bb
+ store i8* null, i8** %arg1, align 8
+ br label %bb110
+
+bb106:; preds = %bb
+ call void @foo()
+ br label %bb110
+
+bb110:; preds = %bb106, %bb100
+ %i10.1 = phi i8* [ %arg2, %bb106 ], [ %i28.i, %bb100 ]
+ callbr void asm sideeffect "#$0 $1 $2",
"i,i,X,~{dirflag},~{fpsr},~{flags}"(i32 42, i1 false, i8* blockaddress(@test1,
%bb17.i.i.i))
+ to label %kmem_cache_has_cpu_partial.exit [label %bb17
