diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Frontend/FrontendAction.cpp | 3 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/codegen-opt/bar.h (renamed from clang/test/Modules/Inputs/codegen/bar.h) | 0 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/codegen-opt/bar.modulemap (renamed from clang/test/Modules/Inputs/codegen/bar.modulemap) | 0 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/codegen-opt/foo.h | 10 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/codegen-opt/foo.modulemap | 1 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/codegen-opt/use.cpp (renamed from clang/test/Modules/Inputs/codegen/use.cpp) | 0 | ||||
| -rw-r--r-- | clang/test/Modules/Inputs/codegen/foo.h | 12 | ||||
| -rw-r--r-- | clang/test/Modules/codegen-opt.test | 65 | ||||
| -rw-r--r-- | clang/test/Modules/codegen.test | 63 |
9 files changed, 86 insertions, 68 deletions
diff --git a/clang/lib/Frontend/FrontendAction.cpp b/clang/lib/Frontend/FrontendAction.cpp index 261b3c4fa4a..ed9bb5e77d6 100644 --- a/clang/lib/Frontend/FrontendAction.cpp +++ b/clang/lib/Frontend/FrontendAction.cpp @@ -225,6 +225,9 @@ bool FrontendAction::BeginSourceFile(CompilerInstance &CI, CI.setFileManager(&AST->getFileManager()); CI.setSourceManager(&AST->getSourceManager()); CI.setPreprocessor(AST->getPreprocessorPtr()); + Preprocessor &PP = CI.getPreprocessor(); + PP.getBuiltinInfo().initializeBuiltins(PP.getIdentifierTable(), + PP.getLangOpts()); CI.setASTContext(&AST->getASTContext()); setCurrentInput(Input, std::move(AST)); diff --git a/clang/test/Modules/Inputs/codegen/bar.h b/clang/test/Modules/Inputs/codegen-opt/bar.h index a00e8f70e08..a00e8f70e08 100644 --- a/clang/test/Modules/Inputs/codegen/bar.h +++ b/clang/test/Modules/Inputs/codegen-opt/bar.h diff --git a/clang/test/Modules/Inputs/codegen/bar.modulemap b/clang/test/Modules/Inputs/codegen-opt/bar.modulemap index f1dc625857e..f1dc625857e 100644 --- a/clang/test/Modules/Inputs/codegen/bar.modulemap +++ b/clang/test/Modules/Inputs/codegen-opt/bar.modulemap diff --git a/clang/test/Modules/Inputs/codegen-opt/foo.h b/clang/test/Modules/Inputs/codegen-opt/foo.h new file mode 100644 index 00000000000..b3a7af7c9d9 --- /dev/null +++ b/clang/test/Modules/Inputs/codegen-opt/foo.h @@ -0,0 +1,10 @@ +void f1(int &); +static void f2() {} +inline void foo() { + static int i; + f1(i); + f2(); +} +inline void foo2() { +} +void foo_ext() {} diff --git a/clang/test/Modules/Inputs/codegen-opt/foo.modulemap b/clang/test/Modules/Inputs/codegen-opt/foo.modulemap new file mode 100644 index 00000000000..2e095d2794c --- /dev/null +++ b/clang/test/Modules/Inputs/codegen-opt/foo.modulemap @@ -0,0 +1 @@ +module foo { header "foo.h" } diff --git a/clang/test/Modules/Inputs/codegen/use.cpp b/clang/test/Modules/Inputs/codegen-opt/use.cpp index b55a31fe158..b55a31fe158 100644 --- a/clang/test/Modules/Inputs/codegen/use.cpp +++ b/clang/test/Modules/Inputs/codegen-opt/use.cpp diff --git a/clang/test/Modules/Inputs/codegen/foo.h b/clang/test/Modules/Inputs/codegen/foo.h index b3a7af7c9d9..3fcab718573 100644 --- a/clang/test/Modules/Inputs/codegen/foo.h +++ b/clang/test/Modules/Inputs/codegen/foo.h @@ -1,10 +1,4 @@ -void f1(int &); -static void f2() {} -inline void foo() { - static int i; - f1(i); - f2(); +inline void f1(const char* fmt, ...) { + __builtin_va_list args; + __builtin_va_start(args, fmt); } -inline void foo2() { -} -void foo_ext() {} diff --git a/clang/test/Modules/codegen-opt.test b/clang/test/Modules/codegen-opt.test new file mode 100644 index 00000000000..2f4997a7c73 --- /dev/null +++ b/clang/test/Modules/codegen-opt.test @@ -0,0 +1,65 @@ +RUN: rm -rf %t +REQUIRES: x86-registered-target + +RUN: %clang_cc1 -triple=x86_64-linux-gnu -fmodules-codegen -x c++ -fmodules -emit-module -fmodule-name=foo %S/Inputs/codegen-opt/foo.modulemap -o %t/foo.pcm +RUN: %clang_cc1 -triple=x86_64-linux-gnu -fmodules-codegen -x c++ -fmodules -emit-module -fmodule-name=bar %S/Inputs/codegen-opt/bar.modulemap -o %t/bar.pcm -fmodule-file=%t/foo.pcm + +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %t/foo.pcm | FileCheck --check-prefix=FOO %s +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %t/bar.pcm -fmodule-file=%t/foo.pcm | FileCheck --check-prefix=BAR-CMN --check-prefix=BAR %s +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -fmodules -fmodule-file=%t/foo.pcm -fmodule-file=%t/bar.pcm %S/Inputs/codegen-opt/use.cpp | FileCheck --check-prefix=USE-CMN --check-prefix=USE %s + +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -O2 -disable-llvm-passes %t/foo.pcm | FileCheck --check-prefix=FOO %s +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -O2 -disable-llvm-passes %t/bar.pcm -fmodule-file=%t/foo.pcm | FileCheck --check-prefix=BAR-CMN --check-prefix=BAR-OPT %s +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -O2 -disable-llvm-passes -fmodules -fmodule-file=%t/foo.pcm -fmodule-file=%t/bar.pcm %S/Inputs/codegen-opt/use.cpp | FileCheck --check-prefix=USE-CMN --check-prefix=USE-OPT %s + +FOO-NOT: comdat +FOO: $_Z3foov = comdat any +FOO: $_Z4foo2v = comdat any +FOO: $_ZZ3foovE1i = comdat any +FOO: @_ZZ3foovE1i = linkonce_odr global i32 0, comdat +FOO-NOT: {{comdat|define|declare}} +FOO: define void @_Z7foo_extv() +FOO-NOT: {{define|declare}} +FOO: define weak_odr void @_Z3foov() #{{[0-9]+}} comdat +FOO-NOT: {{define|declare}} +FOO: declare void @_Z2f1Ri(i32* +FOO-NOT: {{define|declare}} + +FIXME: this internal function should be weak_odr, comdat, and with a new mangling +FOO: define internal void @_ZL2f2v() #{{[0-9]+}} +FOO-NOT: {{define|declare}} + +FOO: define weak_odr void @_Z4foo2v() #{{[0-9]+}} comdat +FOO-NOT: {{define|declare}} + + +BAR-CMN-NOT: comdat +BAR-CMN: $_Z3barv = comdat any +BAR-OPT: @_ZZ3foovE1i = linkonce_odr global i32 0, comdat +BAR-CMN-NOT: {{comdat|define|declare}} +BAR-CMN: define weak_odr void @_Z3barv() #{{[0-9]+}} comdat +BAR-CMN-NOT: {{define|declare}} +BAR: declare void @_Z3foov() +Include all the available_externally definitions required for bar (foo -> f2) +BAR-OPT: define available_externally void @_Z3foov() +BAR-CMN-NOT: {{define|declare}} +BAR-OPT: declare void @_Z2f1Ri(i32* +BAR-OPT-NOT: {{define|declare}} +BAR-OPT: define available_externally void @_ZL2f2v() +BAR-OPT-NOT: {{define|declare}} + + +USE-OPT: @_ZZ3foovE1i = linkonce_odr global i32 0, comdat +USE-CMN-NOT: {{comdat|define|declare}} +USE-CMN: define i32 @main() +USE-CMN-NOT: {{define|declare}} +USE: declare void @_Z3barv() +Include all the available_externally definitions required for main (bar -> foo -> f2) +USE-OPT: define available_externally void @_Z3barv() +USE-CMN-NOT: {{define|declare}} +USE-OPT: define available_externally void @_Z3foov() +USE-OPT-NOT: {{define|declare}} +USE-OPT: declare void @_Z2f1Ri(i32* +USE-OPT-NOT: {{define|declare}} +USE-OPT: define available_externally void @_ZL2f2v() +USE-OPT-NOT: {{define|declare}} diff --git a/clang/test/Modules/codegen.test b/clang/test/Modules/codegen.test index bc3c14357aa..f1823d55baf 100644 --- a/clang/test/Modules/codegen.test +++ b/clang/test/Modules/codegen.test @@ -2,64 +2,9 @@ RUN: rm -rf %t REQUIRES: x86-registered-target RUN: %clang_cc1 -triple=x86_64-linux-gnu -fmodules-codegen -x c++ -fmodules -emit-module -fmodule-name=foo %S/Inputs/codegen/foo.modulemap -o %t/foo.pcm -RUN: %clang_cc1 -triple=x86_64-linux-gnu -fmodules-codegen -x c++ -fmodules -emit-module -fmodule-name=bar %S/Inputs/codegen/bar.modulemap -o %t/bar.pcm -fmodule-file=%t/foo.pcm -RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %t/foo.pcm | FileCheck --check-prefix=FOO %s -RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %t/bar.pcm -fmodule-file=%t/foo.pcm | FileCheck --check-prefix=BAR-CMN --check-prefix=BAR %s -RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -fmodules -fmodule-file=%t/foo.pcm -fmodule-file=%t/bar.pcm %S/Inputs/codegen/use.cpp | FileCheck --check-prefix=USE-CMN --check-prefix=USE %s +RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - %t/foo.pcm | FileCheck %s -RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -O2 -disable-llvm-passes %t/foo.pcm | FileCheck --check-prefix=FOO %s -RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -O2 -disable-llvm-passes %t/bar.pcm -fmodule-file=%t/foo.pcm | FileCheck --check-prefix=BAR-CMN --check-prefix=BAR-OPT %s -RUN: %clang_cc1 -triple x86_64-linux-gnu -emit-llvm -o - -O2 -disable-llvm-passes -fmodules -fmodule-file=%t/foo.pcm -fmodule-file=%t/bar.pcm %S/Inputs/codegen/use.cpp | FileCheck --check-prefix=USE-CMN --check-prefix=USE-OPT %s - -FOO-NOT: comdat -FOO: $_Z3foov = comdat any -FOO: $_Z4foo2v = comdat any -FOO: $_ZZ3foovE1i = comdat any -FOO: @_ZZ3foovE1i = linkonce_odr global i32 0, comdat -FOO-NOT: {{comdat|define|declare}} -FOO: define void @_Z7foo_extv() -FOO-NOT: {{define|declare}} -FOO: define weak_odr void @_Z3foov() #{{[0-9]+}} comdat -FOO-NOT: {{define|declare}} -FOO: declare void @_Z2f1Ri(i32* -FOO-NOT: {{define|declare}} - -FIXME: this internal function should be weak_odr, comdat, and with a new mangling -FOO: define internal void @_ZL2f2v() #{{[0-9]+}} -FOO-NOT: {{define|declare}} - -FOO: define weak_odr void @_Z4foo2v() #{{[0-9]+}} comdat -FOO-NOT: {{define|declare}} - - -BAR-CMN-NOT: comdat -BAR-CMN: $_Z3barv = comdat any -BAR-OPT: @_ZZ3foovE1i = linkonce_odr global i32 0, comdat -BAR-CMN-NOT: {{comdat|define|declare}} -BAR-CMN: define weak_odr void @_Z3barv() #{{[0-9]+}} comdat -BAR-CMN-NOT: {{define|declare}} -BAR: declare void @_Z3foov() -Include all the available_externally definitions required for bar (foo -> f2) -BAR-OPT: define available_externally void @_Z3foov() -BAR-CMN-NOT: {{define|declare}} -BAR-OPT: declare void @_Z2f1Ri(i32* -BAR-OPT-NOT: {{define|declare}} -BAR-OPT: define available_externally void @_ZL2f2v() -BAR-OPT-NOT: {{define|declare}} - - -USE-OPT: @_ZZ3foovE1i = linkonce_odr global i32 0, comdat -USE-CMN-NOT: {{comdat|define|declare}} -USE-CMN: define i32 @main() -USE-CMN-NOT: {{define|declare}} -USE: declare void @_Z3barv() -Include all the available_externally definitions required for main (bar -> foo -> f2) -USE-OPT: define available_externally void @_Z3barv() -USE-CMN-NOT: {{define|declare}} -USE-OPT: define available_externally void @_Z3foov() -USE-OPT-NOT: {{define|declare}} -USE-OPT: declare void @_Z2f1Ri(i32* -USE-OPT-NOT: {{define|declare}} -USE-OPT: define available_externally void @_ZL2f2v() -USE-OPT-NOT: {{define|declare}} +CHECK: $_Z2f1PKcz = comdat any +CHECK: define weak_odr void @_Z2f1PKcz(i8* %fmt, ...) #{{[0-9]+}} comdat +CHECK: call void @llvm.va_start(i8* %{{[a-zA-Z0-9]*}}) |
