[llvm-commits] [llvm] r53001 - in /llvm/trunk: include/llvm/CodeGen/MachineDebugInfoDesc.h lib/CodeGen/MachineDebugInfoDesc.cpp lib/CodeGen/MachineModuleInfo.cpp

[Bill Wendling]

Author: void
Date: Tue Jul  1 19:35:47 2008
New Revision: 53001

URL: http://llvm.org/viewvc/llvm-project?rev=53001&view=rev
Log:
Sorry. I couldn't sleep at night knowing I put these ugly casts into the source tree.

Modified:
    llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h
    llvm/trunk/lib/CodeGen/MachineDebugInfoDesc.cpp
    llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp

Modified: llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h?rev=53001&r1=53000&r2=53001&view=diff

==============================================================================
--- llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h (original)
+++ llvm/trunk/include/llvm/CodeGen/MachineDebugInfoDesc.h Tue Jul  1 19:35:47 2008
@@ -14,6 +14,7 @@
 #ifndef LLVM_CODEGEN_MACHINEDEBUGINFODESC_H
 #define LLVM_CODEGEN_MACHINEDEBUGINFODESC_H
 
+#include "llvm/GlobalValue.h"
 #include "llvm/Support/DataTypes.h"
 #include <string>
 #include <vector>
@@ -67,7 +68,7 @@
   
   /// getLinkage - get linkage appropriate for this type of descriptor.
   ///
-  virtual unsigned getLinkage() const;
+  virtual GlobalValue::LinkageTypes getLinkage() const;
     
   //===--------------------------------------------------------------------===//
   // Subclasses should supply the following virtual methods.
@@ -111,7 +112,7 @@
 
   /// getLinkage - get linkage appropriate for this type of descriptor.
   ///
-  virtual unsigned getLinkage() const;
+  virtual GlobalValue::LinkageTypes getLinkage() const;
 
   /// ApplyToFields - Target the visitor to the fields of the AnchorDesc.
   ///

Modified: llvm/trunk/lib/CodeGen/MachineDebugInfoDesc.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineDebugInfoDesc.cpp?rev=53001&r1=53000&r2=53001&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineDebugInfoDesc.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineDebugInfoDesc.cpp Tue Jul  1 19:35:47 2008
@@ -92,8 +92,8 @@
 }
 
 /// getLinkage - get linkage appropriate for this type of descriptor.
-unsigned DebugInfoDesc::getLinkage() const {
-  return (unsigned)GlobalValue::InternalLinkage;
+GlobalValue::LinkageTypes DebugInfoDesc::getLinkage() const {
+  return GlobalValue::InternalLinkage;
 }
 
 /// ApplyToFields - Target the vistor to the fields of the descriptor.
@@ -115,8 +115,8 @@
 }
   
 /// getLinkage - get linkage appropriate for this type of descriptor.
-unsigned AnchorDesc::getLinkage() const {
-  return (unsigned)GlobalValue::LinkOnceLinkage;
+GlobalValue::LinkageTypes AnchorDesc::getLinkage() const {
+  return GlobalValue::LinkOnceLinkage;
 }
 
 /// ApplyToFields - Target the visitor to the fields of the TransUnitDesc.

Modified: llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp?rev=53001&r1=53000&r2=53001&view=diff

==============================================================================
--- llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp (original)
+++ llvm/trunk/lib/CodeGen/MachineModuleInfo.cpp Tue Jul  1 19:35:47 2008
@@ -587,8 +587,7 @@
 
   // Create the GlobalVariable early to prevent infinite recursion.
   GlobalVariable *GV =
-    new GlobalVariable(Ty, true,
-                       (GlobalValue::LinkageTypes)DD->getLinkage(),
+    new GlobalVariable(Ty, true, DD->getLinkage(),
                        NULL, DD->getDescString(), M);
   GV->setSection("llvm.metadata");