r294512 - Initialize builtins during modular codegen

David Blaikie via cfe-commits cfe-commits at lists.llvm.org
Wed Feb 8 12:51:12 PST 2017 

Author: dblaikie
Date: Wed Feb  8 14:51:11 2017
New Revision: 294512

URL: http://llvm.org/viewvc/llvm-project?rev=294512&view=rev
Log:
Initialize builtins during modular codegen

Added:
    cfe/trunk/test/Modules/Inputs/codegen-opt/
    cfe/trunk/test/Modules/Inputs/codegen-opt/bar.h
      - copied, changed from r294397, cfe/trunk/test/Modules/Inputs/codegen/bar.h
    cfe/trunk/test/Modules/Inputs/codegen-opt/bar.modulemap
      - copied, changed from r294397, cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap
    cfe/trunk/test/Modules/Inputs/codegen-opt/foo.h
      - copied, changed from r294397, cfe/trunk/test/Modules/Inputs/codegen/foo.h
    cfe/trunk/test/Modules/Inputs/codegen-opt/foo.modulemap
    cfe/trunk/test/Modules/Inputs/codegen-opt/use.cpp
      - copied, changed from r294397, cfe/trunk/test/Modules/Inputs/codegen/use.cpp
    cfe/trunk/test/Modules/codegen-opt.test
      - copied, changed from r294397, cfe/trunk/test/Modules/codegen.test
Removed:
    cfe/trunk/test/Modules/Inputs/codegen/bar.h
    cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap
    cfe/trunk/test/Modules/Inputs/codegen/use.cpp
Modified:
    cfe/trunk/lib/Frontend/FrontendAction.cpp
    cfe/trunk/test/Modules/Inputs/codegen/foo.h
    cfe/trunk/test/Modules/codegen.test

Modified: cfe/trunk/lib/Frontend/FrontendAction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendAction.cpp?rev=294512&r1=294511&r2=294512&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/FrontendAction.cpp (original)
+++ cfe/trunk/lib/Frontend/FrontendAction.cpp Wed Feb  8 14:51:11 2017
@@ -225,6 +225,9 @@ bool FrontendAction::BeginSourceFile(Com
     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));

Copied: cfe/trunk/test/Modules/Inputs/codegen-opt/bar.h (from r294397, cfe/trunk/test/Modules/Inputs/codegen/bar.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen-opt/bar.h?p2=cfe/trunk/test/Modules/Inputs/codegen-opt/bar.h&p1=cfe/trunk/test/Modules/Inputs/codegen/bar.h&r1=294397&r2=294512&rev=294512&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/Modules/Inputs/codegen-opt/bar.modulemap (from r294397, cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen-opt/bar.modulemap?p2=cfe/trunk/test/Modules/Inputs/codegen-opt/bar.modulemap&p1=cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap&r1=294397&r2=294512&rev=294512&view=diff
==============================================================================
    (empty)

Copied: cfe/trunk/test/Modules/Inputs/codegen-opt/foo.h (from r294397, cfe/trunk/test/Modules/Inputs/codegen/foo.h)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen-opt/foo.h?p2=cfe/trunk/test/Modules/Inputs/codegen-opt/foo.h&p1=cfe/trunk/test/Modules/Inputs/codegen/foo.h&r1=294397&r2=294512&rev=294512&view=diff
==============================================================================
    (empty)

Added: cfe/trunk/test/Modules/Inputs/codegen-opt/foo.modulemap
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen-opt/foo.modulemap?rev=294512&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/codegen-opt/foo.modulemap (added)
+++ cfe/trunk/test/Modules/Inputs/codegen-opt/foo.modulemap Wed Feb  8 14:51:11 2017
@@ -0,0 +1 @@
+module foo { header "foo.h" }

Copied: cfe/trunk/test/Modules/Inputs/codegen-opt/use.cpp (from r294397, cfe/trunk/test/Modules/Inputs/codegen/use.cpp)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen-opt/use.cpp?p2=cfe/trunk/test/Modules/Inputs/codegen-opt/use.cpp&p1=cfe/trunk/test/Modules/Inputs/codegen/use.cpp&r1=294397&r2=294512&rev=294512&view=diff
==============================================================================
    (empty)

Removed: cfe/trunk/test/Modules/Inputs/codegen/bar.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen/bar.h?rev=294511&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/codegen/bar.h (original)
+++ cfe/trunk/test/Modules/Inputs/codegen/bar.h (removed)
@@ -1,2 +0,0 @@
-#include "foo.h"
-inline void bar() { foo(); }

Removed: cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap?rev=294511&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap (original)
+++ cfe/trunk/test/Modules/Inputs/codegen/bar.modulemap (removed)
@@ -1 +0,0 @@
-module bar { header "bar.h" }

Modified: cfe/trunk/test/Modules/Inputs/codegen/foo.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen/foo.h?rev=294512&r1=294511&r2=294512&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/codegen/foo.h (original)
+++ cfe/trunk/test/Modules/Inputs/codegen/foo.h Wed Feb  8 14:51:11 2017
@@ -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() {}

Removed: cfe/trunk/test/Modules/Inputs/codegen/use.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/codegen/use.cpp?rev=294511&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/codegen/use.cpp (original)
+++ cfe/trunk/test/Modules/Inputs/codegen/use.cpp (removed)
@@ -1,2 +0,0 @@
-#include "bar.h"
-int main() { bar(); }

Copied: cfe/trunk/test/Modules/codegen-opt.test (from r294397, cfe/trunk/test/Modules/codegen.test)
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/codegen-opt.test?p2=cfe/trunk/test/Modules/codegen-opt.test&p1=cfe/trunk/test/Modules/codegen.test&r1=294397&r2=294512&rev=294512&view=diff
==============================================================================
--- cfe/trunk/test/Modules/codegen.test (original)
+++ cfe/trunk/test/Modules/codegen-opt.test Wed Feb  8 14:51:11 2017
@@ -1,16 +1,16 @@
 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 -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/use.cpp | FileCheck --check-prefix=USE-CMN --check-prefix=USE %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/use.cpp | FileCheck --check-prefix=USE-CMN --check-prefix=USE-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

Modified: cfe/trunk/test/Modules/codegen.test
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/codegen.test?rev=294512&r1=294511&r2=294512&view=diff
==============================================================================
--- cfe/trunk/test/Modules/codegen.test (original)
+++ cfe/trunk/test/Modules/codegen.test Wed Feb  8 14:51:11 2017
@@ -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]*}})

More information about the cfe-commits mailing list