From: Bill Wendling <isanbard@gmail.com>
Date: Wed, 2 Jul 2008 00:35:47 +0000 (+0000)
Subject: Sorry. I couldn't sleep at night knowing I put these ugly casts into the source tree.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=12432cfc59862e6a71b4f320677a41788cdd0860;p=oota-llvm.git

Sorry. I couldn't sleep at night knowing I put these ugly casts into the source tree.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@53001 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/CodeGen/MachineDebugInfoDesc.h b/include/llvm/CodeGen/MachineDebugInfoDesc.h
index 50f093d21fa..55f8767c881 100644
--- a/include/llvm/CodeGen/MachineDebugInfoDesc.h
+++ b/include/llvm/CodeGen/MachineDebugInfoDesc.h
@@ -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 @@ public:
   
   /// 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 @@ public:
 
   /// 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.
   ///
diff --git a/lib/CodeGen/MachineDebugInfoDesc.cpp b/lib/CodeGen/MachineDebugInfoDesc.cpp
index 3477dd6a89b..23853862c28 100644
--- a/lib/CodeGen/MachineDebugInfoDesc.cpp
+++ b/lib/CodeGen/MachineDebugInfoDesc.cpp
@@ -92,8 +92,8 @@ DebugInfoDesc *DebugInfoDesc::DescFactory(unsigned Tag) {
 }
 
 /// 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 @@ bool AnchorDesc::classof(const DebugInfoDesc *D) {
 }
   
 /// 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.
diff --git a/lib/CodeGen/MachineModuleInfo.cpp b/lib/CodeGen/MachineModuleInfo.cpp
index 44e4ee36ecd..473b60554b6 100644
--- a/lib/CodeGen/MachineModuleInfo.cpp
+++ b/lib/CodeGen/MachineModuleInfo.cpp
@@ -587,8 +587,7 @@ GlobalVariable *DISerializer::Serialize(DebugInfoDesc *DD) {
 
   // 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");