From 10b9edbb69de46a124e6cf37507c3315e79fb0ed Mon Sep 17 00:00:00 2001 From: Reid Spencer Date: Wed, 26 Jul 2006 16:18:00 +0000 Subject: [PATCH] For PR780: 1. Move IncludeFile.h to System library 2. Move IncludeFile.cpp to System library 3. #1 and #2 required to prevent cyclic library dependencies for libSystem 4. Convert all existing uses of Support/IncludeFile.h to System/IncludeFile.h 5. Add IncludeFile support to various lib/System classes. 6. Add new lib/System classes to LinkAllVMCore.h All this in an attempt to pull in lib/System to what's required for VMCore llvm-svn: 29287 --- include/llvm/Analysis/AliasAnalysis.h | 2 +- include/llvm/InlineAsm.h | 2 +- include/llvm/IntrinsicInst.h | 2 +- include/llvm/LinkAllVMCore.h | 10 ++- include/llvm/PassSupport.h | 2 +- include/llvm/Support/Dwarf.h | 4 ++ include/llvm/Support/IncludeFile.h | 65 -------------------- include/llvm/Support/Mangler.h | 2 +- include/llvm/Support/MathExtras.h | 4 ++ include/llvm/Support/SlowOperationInformer.h | 3 + include/llvm/System/IncludeFile.h | 6 +- include/llvm/System/Memory.h | 3 + include/llvm/System/Mutex.h | 4 ++ lib/CodeGen/SelectionDAG/Makefile | 1 + lib/Support/Dwarf.cpp | 3 + lib/Support/IncludeFile.cpp | 20 ------ lib/Support/IsInf.cpp | 3 + lib/Support/IsNAN.cpp | 4 ++ lib/Support/SlowOperationInformer.cpp | 3 + lib/System/IncludeFile.cpp | 6 +- lib/System/Memory.cpp | 2 + lib/System/Mutex.cpp | 3 + lib/VMCore/Verifier.cpp | 15 ++--- 23 files changed, 64 insertions(+), 105 deletions(-) delete mode 100644 include/llvm/Support/IncludeFile.h delete mode 100644 lib/Support/IncludeFile.cpp diff --git a/include/llvm/Analysis/AliasAnalysis.h b/include/llvm/Analysis/AliasAnalysis.h index 2fff77420ae..66f60ab547d 100644 --- a/include/llvm/Analysis/AliasAnalysis.h +++ b/include/llvm/Analysis/AliasAnalysis.h @@ -31,7 +31,7 @@ #define LLVM_ANALYSIS_ALIAS_ANALYSIS_H #include "llvm/Support/CallSite.h" -#include "llvm/Support/IncludeFile.h" +#include "llvm/System/IncludeFile.h" namespace llvm { diff --git a/include/llvm/InlineAsm.h b/include/llvm/InlineAsm.h index 6e7aab1cb03..b9f707cf83c 100644 --- a/include/llvm/InlineAsm.h +++ b/include/llvm/InlineAsm.h @@ -17,7 +17,7 @@ #define LLVM_INLINEASM_H #include "llvm/Value.h" -#include "llvm/Support/IncludeFile.h" +#include "llvm/System/IncludeFile.h" #include namespace llvm { diff --git a/include/llvm/IntrinsicInst.h b/include/llvm/IntrinsicInst.h index 5b784fc2b90..996c83cb8ef 100644 --- a/include/llvm/IntrinsicInst.h +++ b/include/llvm/IntrinsicInst.h @@ -28,7 +28,7 @@ #include "llvm/Function.h" #include "llvm/Instructions.h" #include "llvm/Intrinsics.h" -#include "llvm/Support/IncludeFile.h" +#include "llvm/System/IncludeFile.h" namespace llvm { /// IntrinsicInst - A useful wrapper class for inspecting calls to intrinsic diff --git a/include/llvm/LinkAllVMCore.h b/include/llvm/LinkAllVMCore.h index d0366ebe1e1..fa46dbb1f11 100644 --- a/include/llvm/LinkAllVMCore.h +++ b/include/llvm/LinkAllVMCore.h @@ -16,13 +16,19 @@ #ifndef LLVM_LINKALLVMCORE_H #define LLVM_LINKALLVMCORE_H -#include "llvm/Support/IncludeFile.h" -#include "llvm/Support/Mangler.h" +#include "llvm/System/IncludeFile.h" + #include "llvm/Module.h" #include "llvm/Instructions.h" #include "llvm/IntrinsicInst.h" #include "llvm/InlineAsm.h" #include "llvm/Analysis/Verifier.h" +#include "llvm/System/Memory.h" +#include "llvm/System/Mutex.h" +#include "llvm/Support/Dwarf.h" +#include "llvm/Support/Mangler.h" +#include "llvm/Support/MathExtras.h" +#include "llvm/Support/SlowOperationInformer.h" namespace { struct ForceVMCoreLinking { diff --git a/include/llvm/PassSupport.h b/include/llvm/PassSupport.h index 57dcce79506..9350e284fcf 100644 --- a/include/llvm/PassSupport.h +++ b/include/llvm/PassSupport.h @@ -21,7 +21,7 @@ #ifndef LLVM_PASS_SUPPORT_H #define LLVM_PASS_SUPPORT_H -#include "llvm/Support/IncludeFile.h" +#include "llvm/System/IncludeFile.h" // No need to include Pass.h, we are being included by it! namespace llvm { diff --git a/include/llvm/Support/Dwarf.h b/include/llvm/Support/Dwarf.h index 17622f45158..05260be2d7c 100644 --- a/include/llvm/Support/Dwarf.h +++ b/include/llvm/Support/Dwarf.h @@ -16,6 +16,8 @@ #ifndef LLVM_SUPPORT_DWARF_H #define LLVM_SUPPORT_DWARF_H +#include "llvm/System/IncludeFile.h" + namespace llvm { namespace dwarf { @@ -546,4 +548,6 @@ const char *CallFrameString(unsigned Encoding); } // End of namespace llvm +FORCE_DEFINING_FILE_TO_BE_LINKED(SupportDwarf) + #endif diff --git a/include/llvm/Support/IncludeFile.h b/include/llvm/Support/IncludeFile.h deleted file mode 100644 index 798c6b454fc..00000000000 --- a/include/llvm/Support/IncludeFile.h +++ /dev/null @@ -1,65 +0,0 @@ -//===- llvm/Support/IncludeFile.h - Ensure Linking Of Library ---*- C++ -*-===// -// -// The LLVM Compiler Infrastructure -// -// This file was developed by Reid Spencer and is distributed under the -// University of Illinois Open Source License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file defines the FORCE_DEFINING_FILE_TO_BE_LINKED and DEFINE_FILE_FOR -// macros. -// -//===----------------------------------------------------------------------===// - -#ifndef LLVM_SUPPORT_INCLUDEFILE_H -#define LLVM_SUPPORT_INCLUDEFILE_H - -/// This macro is the public interface that IncludeFile.h exports. This gives -/// us the option to implement the "link the definition" capability in any -/// manner that we choose. All header files that depend on a specific .cpp -/// file being linked at run time should use this macro instead of the -/// IncludeFile class directly. -/// -/// For example, foo.h would use:
-/// FORCE_DEFINING_FILE_TO_BE_LINKED(foo)
-/// -/// And, foo.cp would use:
-/// DEFINING_FILE_FOR(foo)
-#define FORCE_DEFINING_FILE_TO_BE_LINKED(name) \ - namespace llvm { \ - extern char name ## LinkVar; \ - static IncludeFile name ## LinkObj ( &name ## LinkVar ); \ - } - -/// This macro is the counterpart to FORCE_DEFINING_FILE_TO_BE_LINKED. It should -/// be used in a .cpp file to define the name referenced in a header file that -/// will cause linkage of the .cpp file. It should only be used at extern level. -#define DEFINING_FILE_FOR(name) namespace llvm { char name ## LinkVar; } - -namespace llvm { - -/// This class is used in the implementation of FORCE_DEFINING_FILE_TO_BE_LINKED -/// macro to make sure that the implementation of a header file is included -/// into a tool that uses the header. This is solely -/// to overcome problems linking .a files and not getting the implementation -/// of compilation units we need. This is commonly an issue with the various -/// Passes but also occurs elsewhere in LLVM. We like to use .a files because -/// they link faster and provide the smallest executables. However, sometimes -/// those executables are too small, if the program doesn't reference something -/// that might be needed, especially by a loaded share object. This little class -/// helps to resolve that problem. The basic strategy is to use this class in -/// a header file and pass the address of a variable to the constructor. If the -/// variable is defined in the header file's corresponding .cpp file then all -/// tools/libraries that #include the header file will require the .cpp as well. -/// For example:
-/// extern int LinkMyCodeStub;
-/// static IncludeFile LinkMyModule(&LinkMyCodeStub);
-/// @brief Class to ensure linking of corresponding object file. -struct IncludeFile { - IncludeFile(void *); -}; - -} - -#endif diff --git a/include/llvm/Support/Mangler.h b/include/llvm/Support/Mangler.h index 50e49ff8a55..ac7deadf8bd 100644 --- a/include/llvm/Support/Mangler.h +++ b/include/llvm/Support/Mangler.h @@ -14,7 +14,7 @@ #ifndef LLVM_SUPPORT_MANGLER_H #define LLVM_SUPPORT_MANGLER_H -#include "llvm/Support/IncludeFile.h" +#include "llvm/System/IncludeFile.h" #include #include #include diff --git a/include/llvm/Support/MathExtras.h b/include/llvm/Support/MathExtras.h index 0f5961ff739..228d35ceff5 100644 --- a/include/llvm/Support/MathExtras.h +++ b/include/llvm/Support/MathExtras.h @@ -15,6 +15,7 @@ #define LLVM_SUPPORT_MATHEXTRAS_H #include "llvm/Support/DataTypes.h" +#include "llvm/System/IncludeFile.h" namespace llvm { @@ -306,4 +307,7 @@ int IsInf (double d); } // End llvm namespace +FORCE_DEFINING_FILE_TO_BE_LINKED(SupportIsInf) +FORCE_DEFINING_FILE_TO_BE_LINKED(SupportIsNAN) + #endif diff --git a/include/llvm/Support/SlowOperationInformer.h b/include/llvm/Support/SlowOperationInformer.h index d05792672ac..0be01960caf 100644 --- a/include/llvm/Support/SlowOperationInformer.h +++ b/include/llvm/Support/SlowOperationInformer.h @@ -32,6 +32,7 @@ #include #include #include "llvm/Support/DataTypes.h" +#include "llvm/System/IncludeFile.h" namespace llvm { class SlowOperationInformer { @@ -63,3 +64,5 @@ namespace llvm { } // end namespace llvm #endif /* SLOW_OPERATION_INFORMER_H */ + +FORCE_DEFINING_FILE_TO_BE_LINKED(SupportSlowOperationInformer) diff --git a/include/llvm/System/IncludeFile.h b/include/llvm/System/IncludeFile.h index 798c6b454fc..c9f38823597 100644 --- a/include/llvm/System/IncludeFile.h +++ b/include/llvm/System/IncludeFile.h @@ -1,4 +1,4 @@ -//===- llvm/Support/IncludeFile.h - Ensure Linking Of Library ---*- C++ -*-===// +//===- llvm/System/IncludeFile.h - Ensure Linking Of Library ---*- C++ -*-===// // // The LLVM Compiler Infrastructure // @@ -12,8 +12,8 @@ // //===----------------------------------------------------------------------===// -#ifndef LLVM_SUPPORT_INCLUDEFILE_H -#define LLVM_SUPPORT_INCLUDEFILE_H +#ifndef LLVM_SYSTEM_INCLUDEFILE_H +#define LLVM_SYSTEM_INCLUDEFILE_H /// This macro is the public interface that IncludeFile.h exports. This gives /// us the option to implement the "link the definition" capability in any diff --git a/include/llvm/System/Memory.h b/include/llvm/System/Memory.h index 27d7c0cb5c0..c343177e178 100644 --- a/include/llvm/System/Memory.h +++ b/include/llvm/System/Memory.h @@ -15,6 +15,7 @@ #define LLVM_SYSTEM_MEMORY_H #include +#include "llvm/System/IncludeFile.h" namespace llvm { namespace sys { @@ -70,4 +71,6 @@ namespace sys { } } +FORCE_DEFINING_FILE_TO_BE_LINKED(SystemMemory) + #endif diff --git a/include/llvm/System/Mutex.h b/include/llvm/System/Mutex.h index 94dd8113781..27bcea18d34 100644 --- a/include/llvm/System/Mutex.h +++ b/include/llvm/System/Mutex.h @@ -14,6 +14,8 @@ #ifndef LLVM_SYSTEM_MUTEX_H #define LLVM_SYSTEM_MUTEX_H +#include "llvm/System/IncludeFile.h" + namespace llvm { namespace sys @@ -81,4 +83,6 @@ namespace llvm } } +FORCE_DEFINING_FILE_TO_BE_LINKED(SystemMutex) + #endif diff --git a/lib/CodeGen/SelectionDAG/Makefile b/lib/CodeGen/SelectionDAG/Makefile index 306a6caad5d..6c502886c5f 100644 --- a/lib/CodeGen/SelectionDAG/Makefile +++ b/lib/CodeGen/SelectionDAG/Makefile @@ -10,5 +10,6 @@ LEVEL = ../../.. LIBRARYNAME = LLVMSelectionDAG PARALLEL_DIRS = BUILD_ARCHIVE = 1 +DONT_BUILD_RELINKED = 1 include $(LEVEL)/Makefile.common diff --git a/lib/Support/Dwarf.cpp b/lib/Support/Dwarf.cpp index 409eadd5607..35862e84392 100644 --- a/lib/Support/Dwarf.cpp +++ b/lib/Support/Dwarf.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/Dwarf.h" +#include "llvm/System/IncludeFile.h" #include @@ -580,3 +581,5 @@ const char *CallFrameString(unsigned Encoding) { } // End of namespace dwarf. } // End of namespace llvm. + +DEFINING_FILE_FOR(SupportDwarf) diff --git a/lib/Support/IncludeFile.cpp b/lib/Support/IncludeFile.cpp deleted file mode 100644 index d4729176f41..00000000000 --- a/lib/Support/IncludeFile.cpp +++ /dev/null @@ -1,20 +0,0 @@ -//===- lib/Support/IncludeFile.cpp - Ensure Linking Of Implementation -----===// -// -// The LLVM Compiler Infrastructure -// -// This file was developed by Reid Spencer and is distributed under the -// University of Illinois Open Source License. See LICENSE.TXT for details. -// -//===----------------------------------------------------------------------===// -// -// This file implements the IncludeFile constructor. -// -//===----------------------------------------------------------------------===// - -#include "llvm/Support/IncludeFile.h" - -using namespace llvm; - -// This constructor is used to ensure linking of other modules. See the -// llvm/Support/IncludeFile.h header for details. -IncludeFile::IncludeFile(void*) {} diff --git a/lib/Support/IsInf.cpp b/lib/Support/IsInf.cpp index 39c11cd7a66..9b0556fcb09 100644 --- a/lib/Support/IsInf.cpp +++ b/lib/Support/IsInf.cpp @@ -8,6 +8,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Config/config.h" +#include "llvm/System/IncludeFile.h" #if HAVE_ISINF_IN_MATH_H # include @@ -43,3 +44,5 @@ int IsInf (float f) { return isinf (f); } int IsInf (double d) { return isinf (d); } } // end namespace llvm; + +DEFINING_FILE_FOR(SupportIsInf) diff --git a/lib/Support/IsNAN.cpp b/lib/Support/IsNAN.cpp index 2ed2b284c7d..5ed3971254b 100644 --- a/lib/Support/IsNAN.cpp +++ b/lib/Support/IsNAN.cpp @@ -12,6 +12,8 @@ //===----------------------------------------------------------------------===// #include "llvm/Config/config.h" +#include "llvm/System/IncludeFile.h" + #if HAVE_ISNAN_IN_MATH_H # include #elif HAVE_ISNAN_IN_CMATH @@ -32,3 +34,5 @@ int IsNAN (float f) { return isnan (f); } int IsNAN (double d) { return isnan (d); } } // end namespace llvm; + +DEFINING_FILE_FOR(SupportIsNAN) diff --git a/lib/Support/SlowOperationInformer.cpp b/lib/Support/SlowOperationInformer.cpp index bfdfe8808f4..c5f27187011 100644 --- a/lib/Support/SlowOperationInformer.cpp +++ b/lib/Support/SlowOperationInformer.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// #include "llvm/Support/SlowOperationInformer.h" +#include "llvm/System/IncludeFile.h" #include "llvm/System/Alarm.h" #include #include @@ -64,3 +65,5 @@ bool SlowOperationInformer::progress(unsigned Amount) { std::cout << ToPrint+OS.str() << std::flush; return false; } + +DEFINING_FILE_FOR(SupportSlowOperationInformer) diff --git a/lib/System/IncludeFile.cpp b/lib/System/IncludeFile.cpp index d4729176f41..2ba9595ea18 100644 --- a/lib/System/IncludeFile.cpp +++ b/lib/System/IncludeFile.cpp @@ -1,4 +1,4 @@ -//===- lib/Support/IncludeFile.cpp - Ensure Linking Of Implementation -----===// +//===- lib/System/IncludeFile.cpp - Ensure Linking Of Implementation -----===// // // The LLVM Compiler Infrastructure // @@ -11,10 +11,10 @@ // //===----------------------------------------------------------------------===// -#include "llvm/Support/IncludeFile.h" +#include "llvm/System/IncludeFile.h" using namespace llvm; // This constructor is used to ensure linking of other modules. See the -// llvm/Support/IncludeFile.h header for details. +// llvm/System/IncludeFile.h header for details. IncludeFile::IncludeFile(void*) {} diff --git a/lib/System/Memory.cpp b/lib/System/Memory.cpp index e951e3c26a1..3788abef08a 100644 --- a/lib/System/Memory.cpp +++ b/lib/System/Memory.cpp @@ -14,6 +14,7 @@ #include "llvm/System/Memory.h" #include "llvm/Config/config.h" +#include "llvm/System/IncludeFile.h" namespace llvm { using namespace sys; @@ -33,3 +34,4 @@ using namespace sys; #include "Win32/Memory.inc" #endif +DEFINING_FILE_FOR(SystemMemory) diff --git a/lib/System/Mutex.cpp b/lib/System/Mutex.cpp index abcf77e6751..44e3332d179 100644 --- a/lib/System/Mutex.cpp +++ b/lib/System/Mutex.cpp @@ -13,6 +13,7 @@ #include "llvm/Config/config.h" #include "llvm/System/Mutex.h" +#include "llvm/System/IncludeFile.h" //===----------------------------------------------------------------------===// //=== WARNING: Implementation here must contain only TRULY operating system @@ -157,3 +158,5 @@ Mutex::tryacquire() #warning Neither LLVM_ON_UNIX nor LLVM_ON_WIN32 was set in System/Mutex.cpp #endif #endif + +DEFINING_FILE_FOR(SystemMutex) diff --git a/lib/VMCore/Verifier.cpp b/lib/VMCore/Verifier.cpp index 635f5a25edf..3dac3f1a74f 100644 --- a/lib/VMCore/Verifier.cpp +++ b/lib/VMCore/Verifier.cpp @@ -105,7 +105,7 @@ namespace { // Anonymous namespace for class // returning back to the pass manager, or else the pass manager may try to // run other passes on the broken module. if (RealPass) - abortIfBroken(); + return abortIfBroken(); return false; } @@ -119,7 +119,7 @@ namespace { // Anonymous namespace for class // returning back to the pass manager, or else the pass manager may try to // run other passes on the broken module. if (RealPass) - abortIfBroken(); + return abortIfBroken(); return false; } @@ -138,8 +138,7 @@ namespace { // Anonymous namespace for class visitGlobalVariable(*I); // If the module is broken, abort at this time. - abortIfBroken(); - return false; + return abortIfBroken(); } virtual void getAnalysisUsage(AnalysisUsage &AU) const { @@ -151,7 +150,7 @@ namespace { // Anonymous namespace for class /// abortIfBroken - If the module is broken and we are supposed to abort on /// this condition, do so. /// - void abortIfBroken() { + bool abortIfBroken() { if (Broken) { msgs << "Broken module found, "; switch (action) { @@ -162,11 +161,13 @@ namespace { // Anonymous namespace for class case PrintMessageAction: msgs << "verification continues.\n"; std::cerr << msgs.str(); - break; + return false; case ReturnStatusAction: - break; + msgs << "compilation terminated.\n"; + return Broken; } } + return false; }