switch GC_LABEL to use an MCSymbol operand instead of a label ID operand.

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

2 files changed, 6 insertions, 7 deletions

diff --git a/include/llvm/CodeGen/GCMetadata.h b/include/llvm/CodeGen/GCMetadata.h
index 04fd8bed97..783f636740 100644
--- a/include/llvm/CodeGen/GCMetadata.h
+++ b/include/llvm/CodeGen/GCMetadata.h
@@ -38,12 +38,10 @@
 #include "llvm/ADT/StringMap.h"
 
 namespace llvm {
-  
   class AsmPrinter;
   class GCStrategy;
   class Constant;
-  class MCAsmInfo;
-  
+  class MCSymbol;
   
   namespace GC {
     /// PointKind - The type of a collector-safe point.
@@ -60,9 +58,9 @@ namespace llvm {
   /// 
   struct GCPoint {
     GC::PointKind Kind; //< The kind of the safe point.
-    unsigned Num;       //< Usually a label.
+    MCSymbol *Label;    //< A label.
     
-    GCPoint(GC::PointKind K, unsigned N) : Kind(K), Num(N) {}
+    GCPoint(GC::PointKind K, MCSymbol *L) : Kind(K), Label(L) {}
   };
   
   /// GCRoot - Metadata for a pointer to an object managed by the garbage
@@ -123,8 +121,8 @@ namespace llvm {
     /// addSafePoint - Notes the existence of a safe point. Num is the ID of the
     /// label just prior to the safe point (if the code generator is using 
     /// MachineModuleInfo).
-    void addSafePoint(GC::PointKind Kind, unsigned Num) {
-      SafePoints.push_back(GCPoint(Kind, Num));
+    void addSafePoint(GC::PointKind Kind, MCSymbol *Label) {
+      SafePoints.push_back(GCPoint(Kind, Label));
     }
     
     /// getFrameSize/setFrameSize - Records the function's frame size.
diff --git a/include/llvm/CodeGen/GCMetadataPrinter.h b/include/llvm/CodeGen/GCMetadataPrinter.h
index ff1a205adb..62875c398b 100644
--- a/include/llvm/CodeGen/GCMetadataPrinter.h
+++ b/include/llvm/CodeGen/GCMetadataPrinter.h
@@ -28,6 +28,7 @@ namespace llvm {
   
   class GCMetadataPrinter;
   class raw_ostream;
+  class MCAsmInfo;
   
   /// GCMetadataPrinterRegistry - The GC assembly printer registry uses all the
   /// defaults from Registry.