[cfe-commits] r144742 - in /cfe/trunk: lib/Frontend/FrontendActions.cpp test/Modules/Inputs/irgen.h test/Modules/Inputs/module.map test/Modules/irgen.c test/Modules/lookup.cpp test/Modules/lookup.m

[Douglas Gregor]

Author: dgregor
Date: Tue Nov 15 18:21:54 2011
New Revision: 144742

URL: http://llvm.org/viewvc/llvm-project?rev=144742&view=rev
Log:
Switch some more of the modules tests over to "-emit-module-from-map",
and remove stray fprintf.

Added:
    cfe/trunk/test/Modules/Inputs/irgen.h
Modified:
    cfe/trunk/lib/Frontend/FrontendActions.cpp
    cfe/trunk/test/Modules/Inputs/module.map
    cfe/trunk/test/Modules/irgen.c
    cfe/trunk/test/Modules/lookup.cpp
    cfe/trunk/test/Modules/lookup.m

Modified: cfe/trunk/lib/Frontend/FrontendActions.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/FrontendActions.cpp?rev=144742&r1=144741&r2=144742&view=diff
==============================================================================
--- cfe/trunk/lib/Frontend/FrontendActions.cpp (original)
+++ cfe/trunk/lib/Frontend/FrontendActions.cpp Tue Nov 15 18:21:54 2011
@@ -165,8 +165,6 @@
   if (Module->UmbrellaHeader) {
     // FIXME: Deal with explicit submodule headers, which won't be contained
     // within the umbrella header.
-    fprintf(stderr, "note: using umbrella header \"%s\"\n", 
-            Module->UmbrellaHeader->getName());
     setCurrentFile(Module->UmbrellaHeader->getName(), getCurrentFileKind());
   } else {    
     // FIXME: Deal with the non-umbrella case, where we have to synthesize

Added: cfe/trunk/test/Modules/Inputs/irgen.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/irgen.h?rev=144742&view=auto
==============================================================================
--- cfe/trunk/test/Modules/Inputs/irgen.h (added)
+++ cfe/trunk/test/Modules/Inputs/irgen.h Tue Nov 15 18:21:54 2011
@@ -0,0 +1 @@
+static inline int triple(int x) { return x * 3; }

Modified: cfe/trunk/test/Modules/Inputs/module.map
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/Inputs/module.map?rev=144742&r1=144741&r2=144742&view=diff
==============================================================================
--- cfe/trunk/test/Modules/Inputs/module.map (original)
+++ cfe/trunk/test/Modules/Inputs/module.map Tue Nov 15 18:21:54 2011
@@ -2,3 +2,8 @@
 module diamond_left { umbrella "diamond_left.h" }
 module diamond_right { umbrella "diamond_right.h" }
 module diamond_bottom { umbrella "diamond_bottom.h" }
+module irgen { umbrella "irgen.h" }
+module lookup_left_objc { umbrella "lookup_left.h" }
+module lookup_right_objc { umbrella "lookup_right.h" }
+module lookup_left_cxx { umbrella "lookup_left.hpp" }
+module lookup_right_cxx { umbrella "lookup_right.hpp" }

Modified: cfe/trunk/test/Modules/irgen.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/irgen.c?rev=144742&r1=144741&r2=144742&view=diff
==============================================================================
--- cfe/trunk/test/Modules/irgen.c (original)
+++ cfe/trunk/test/Modules/irgen.c Tue Nov 15 18:21:54 2011
@@ -1,10 +1,8 @@
-// RUN: %clang_cc1 -emit-module -triple x86_64-apple-darwin10 -o %t/module.pcm -DBUILD_MODULE %s
-// RUN: %clang_cc1 -fmodule-cache-path %t -triple x86_64-apple-darwin10 -fdisable-module-hash -emit-llvm -o - %s | FileCheck %s
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodule-cache-path %t -emit-module-from-map -fmodule-name=irgen -triple x86_64-apple-darwin10 %S/Inputs/module.map
+// RUN: %clang_cc1 -fmodule-cache-path %t -triple x86_64-apple-darwin10 -emit-llvm -o - %s | FileCheck %s
 
-#ifdef BUILD_MODULE
-static inline int triple(int x) { return x * 3; }
-#else
-__import_module__ module;
+__import_module__ irgen;
 
 // CHECK: define void @triple_value
 void triple_value(int *px) {
@@ -12,4 +10,3 @@
 }
 
 // CHECK: define internal i32 @triple(i32
-#endif

Modified: cfe/trunk/test/Modules/lookup.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/lookup.cpp?rev=144742&r1=144741&r2=144742&view=diff
==============================================================================
--- cfe/trunk/test/Modules/lookup.cpp (original)
+++ cfe/trunk/test/Modules/lookup.cpp Tue Nov 15 18:21:54 2011
@@ -14,10 +14,11 @@
   ::f0(&f);
 }
 
-// RUN: %clang_cc1 -emit-module -x c++ -verify -o %T/lookup_left_cxx.pcm %S/Inputs/lookup_left.hpp
-// RUN: %clang_cc1 -emit-module -x c++ -o %T/lookup_right_cxx.pcm %S/Inputs/lookup_right.hpp
-// RUN: %clang_cc1 -x c++ -fmodule-cache-path %T -fdisable-module-hash %s -verify
-// RUN: %clang_cc1 -ast-print -x c++ -fmodule-cache-path %T -fdisable-module-hash %s | FileCheck -check-prefix=CHECK-PRINT %s
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -emit-module-from-map -fmodule-cache-path %t -fmodule-name=lookup_left_cxx -x c++ %S/Inputs/module.map -verify
+// RUN: %clang_cc1 -emit-module-from-map -fmodule-cache-path %t -fmodule-name=lookup_right_cxx -x c++ %S/Inputs/module.map -verify
+// RUN: %clang_cc1 -x c++ -fmodule-cache-path %t %s -verify
+// RUN: %clang_cc1 -ast-print -x c++ -fmodule-cache-path %t %s | FileCheck -check-prefix=CHECK-PRINT %s
 
 // CHECK-PRINT: int *f0(int *);
 // CHECK-PRINT: float *f0(float *);

Modified: cfe/trunk/test/Modules/lookup.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Modules/lookup.m?rev=144742&r1=144741&r2=144742&view=diff
==============================================================================
--- cfe/trunk/test/Modules/lookup.m (original)
+++ cfe/trunk/test/Modules/lookup.m Tue Nov 15 18:21:54 2011
@@ -8,10 +8,11 @@
   [x method]; // expected-warning{{multiple methods named 'method' found}}
 }
 
-// RUN: %clang_cc1 -emit-module -x objective-c -o %T/lookup_left_objc.pcm %S/Inputs/lookup_left.h
-// RUN: %clang_cc1 -emit-module -x objective-c -o %T/lookup_right_objc.pcm %S/Inputs/lookup_right.h
-// RUN: %clang_cc1 -x objective-c -fmodule-cache-path %T -fdisable-module-hash -verify %s
-// RUN: %clang_cc1 -ast-print -x objective-c -fmodule-cache-path %T -fdisable-module-hash %s | FileCheck -check-prefix=CHECK-PRINT %s
+// RUN: rm -rf %t
+// RUN: %clang_cc1 -fmodule-cache-path %t -emit-module-from-map -x objective-c -fmodule-name=lookup_left_objc %S/Inputs/module.map
+// RUN: %clang_cc1 -fmodule-cache-path %t -emit-module-from-map -x objective-c -fmodule-name=lookup_right_objc %S/Inputs/module.map
+// RUN: %clang_cc1 -x objective-c -fmodule-cache-path %t -verify %s
+// RUN: %clang_cc1 -ast-print -x objective-c -fmodule-cache-path %t %s | FileCheck -check-prefix=CHECK-PRINT %s
 
 // CHECK-PRINT: - (int) method;
 // CHECK-PRINT: - (double) method