[llvm-commits] [gcc-plugin] r76746 - in /gcc-plugin/trunk: bits_and_bobs.h llvm-types.cpp

[Duncan Sands]

Author: baldrick
Date: Wed Jul 22 11:29:58 2009
New Revision: 76746

URL: http://llvm.org/viewvc/llvm-project?rev=76746&view=rev
Log:
Move SET_TYPE_LLVM/GET_TYPE_LLVM back into llvm-types.

Modified:
    gcc-plugin/trunk/bits_and_bobs.h
    gcc-plugin/trunk/llvm-types.cpp

Modified: gcc-plugin/trunk/bits_and_bobs.h
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/bits_and_bobs.h?rev=76746&r1=76745&r2=76746&view=diff

==============================================================================
--- gcc-plugin/trunk/bits_and_bobs.h (original)
+++ gcc-plugin/trunk/bits_and_bobs.h Wed Jul 22 11:29:58 2009
@@ -19,17 +19,6 @@
 #define DECL_LLVM_IF_SET(NODE) \
   (DECL_LLVM_SET_P (NODE) ? DECL_LLVM (NODE) : NULL)
 
-// GET_TYPE_LLVM/SET_TYPE_LLVM - Associate an LLVM type with each TREE type.
-// These are lazily computed by ConvertType.
-
-extern const Type *llvm_set_type(tree Tr, const Type *Ty);
-
-#define SET_TYPE_LLVM(NODE, TYPE) (const Type *)llvm_set_type(NODE, TYPE)
-
-extern const Type *llvm_get_type(tree Tr);
-
-#define GET_TYPE_LLVM(NODE) (const Type *)llvm_get_type(NODE)
-
 // emit_global_to_llvm - Emit the specified VAR_DECL to LLVM as a global
 // variable.
 // FIXME: Should not be here

Modified: gcc-plugin/trunk/llvm-types.cpp
URL: http://llvm.org/viewvc/llvm-project/gcc-plugin/trunk/llvm-types.cpp?rev=76746&r1=76745&r2=76746&view=diff

==============================================================================
--- gcc-plugin/trunk/llvm-types.cpp (original)
+++ gcc-plugin/trunk/llvm-types.cpp Wed Jul 22 11:29:58 2009
@@ -71,11 +71,15 @@
   return (const Type *)llvm_set_cached(Tr, Ty);
 }
 
+#define SET_TYPE_LLVM(NODE, TYPE) llvm_set_type(NODE, TYPE)
+
 const Type *llvm_get_type(tree Tr) {
   assert(TYPE_P(Tr) && "Expected a gcc type!");
   return (const Type *)llvm_get_cached(Tr);
 }
 
+#define GET_TYPE_LLVM(NODE) llvm_get_type(NODE)
+
 //
 //TODO// LTypes is a vector of LLVM types. GCC tree nodes keep track of LLVM types 
 //TODO// using this vector's index. It is easier to save and restore the index than