Bitcode: Add `OLD_` prefix to metadata node records

I'm about to change these, so move the old ones out of the way.

Part of PR21532.

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

diff --git a/include/llvm/Bitcode/LLVMBitCodes.h b/include/llvm/Bitcode/LLVMBitCodes.h
index c42ecfe66de06ce3f628d45004d054907c33d4af..8e60d8bdfb6d60c76217f54a1b2808f3e4338bc5 100644 (file)
--- a/include/llvm/Bitcode/LLVMBitCodes.h
+++ b/include/llvm/Bitcode/LLVMBitCodes.h
@@ -143,8 +143,8 @@ namespace bitc {
     // 5 is unused.
     METADATA_KIND          = 6,   // [n x [id, name]]
     // 7 is unused.
     // 5 is unused.
     METADATA_KIND          = 6,   // [n x [id, name]]
     // 7 is unused.

-    METADATA_NODE          = 8,   // NODE:          [n x (type num, value num)]
-    METADATA_FN_NODE       = 9,   // FN_NODE:       [n x (type num, value num)]
+    METADATA_OLD_NODE      = 8,   // OLD_NODE:      [n x (type num, value num)]
+    METADATA_OLD_FN_NODE   = 9,   // OLD_FN_NODE:   [n x (type num, value num)]

     METADATA_NAMED_NODE    = 10,  // NAMED_NODE:    [n x mdnodes]
     METADATA_ATTACHMENT    = 11   // [m x [value, [n x [id, mdnode]]]
   };
     METADATA_NAMED_NODE    = 10,  // NAMED_NODE:    [n x mdnodes]
     METADATA_ATTACHMENT    = 11   // [m x [value, [n x [id, mdnode]]]
   };

diff --git a/lib/Bitcode/Reader/BitcodeReader.cpp b/lib/Bitcode/Reader/BitcodeReader.cpp
index cc6180693610236f509d758bc1a93850b925a825..a92b9c83dfcef04e5b2cb6768fe0af915e6aebad 100644 (file)
--- a/lib/Bitcode/Reader/BitcodeReader.cpp
+++ b/lib/Bitcode/Reader/BitcodeReader.cpp
@@ -1115,7 +1115,7 @@ std::error_code BitcodeReader::ParseMetadata() {
       }
       break;
     }
       }
       break;
     }

-    case bitc::METADATA_FN_NODE: {
+    case bitc::METADATA_OLD_FN_NODE: {

       // This is a LocalAsMetadata record, the only type of function-local
       // metadata.
       if (Record.size() % 2 == 1)
       // This is a LocalAsMetadata record, the only type of function-local
       // metadata.
       if (Record.size() % 2 == 1)


@@ -1142,7 +1142,7 @@ std::error_code BitcodeReader::ParseMetadata() {
           NextMDValueNo++);
       break;
     }
           NextMDValueNo++);
       break;
     }

-    case bitc::METADATA_NODE: {
+    case bitc::METADATA_OLD_NODE: {

       if (Record.size() % 2 == 1)
         return Error(BitcodeError::InvalidRecord);
 
       if (Record.size() % 2 == 1)
         return Error(BitcodeError::InvalidRecord);
 

diff --git a/lib/Bitcode/Writer/BitcodeWriter.cpp b/lib/Bitcode/Writer/BitcodeWriter.cpp
index 0de929eaa9929f4b934cbd5142c1ba0e9802912c..f7c29d44d4e67935bf32dee07a4f7aaa7345b58f 100644 (file)
--- a/lib/Bitcode/Writer/BitcodeWriter.cpp
+++ b/lib/Bitcode/Writer/BitcodeWriter.cpp
@@ -754,14 +754,14 @@ static void WriteLocalAsMetadata(const LocalAsMetadata *MD,
                                  const ValueEnumerator &VE,
                                  BitstreamWriter &Stream,
                                  SmallVectorImpl<uint64_t> &Record) {
                                  const ValueEnumerator &VE,
                                  BitstreamWriter &Stream,
                                  SmallVectorImpl<uint64_t> &Record) {

-  WriteValueAsMetadataImpl(MD, VE, Stream, Record, bitc::METADATA_FN_NODE);
+  WriteValueAsMetadataImpl(MD, VE, Stream, Record, bitc::METADATA_OLD_FN_NODE);

 }
 
 static void WriteConstantAsMetadata(const ConstantAsMetadata *MD,
                                     const ValueEnumerator &VE,
                                     BitstreamWriter &Stream,
                                     SmallVectorImpl<uint64_t> &Record) {
 }
 
 static void WriteConstantAsMetadata(const ConstantAsMetadata *MD,
                                     const ValueEnumerator &VE,
                                     BitstreamWriter &Stream,
                                     SmallVectorImpl<uint64_t> &Record) {

-  WriteValueAsMetadataImpl(MD, VE, Stream, Record, bitc::METADATA_NODE);
+  WriteValueAsMetadataImpl(MD, VE, Stream, Record, bitc::METADATA_OLD_NODE);

 }
 
 static void WriteMDNode(const MDNode *N,
 }
 
 static void WriteMDNode(const MDNode *N,


@@ -784,7 +784,7 @@ static void WriteMDNode(const MDNode *N,
     Record.push_back(VE.getTypeID(Type::getMetadataTy(N->getContext())));
     Record.push_back(VE.getMetadataID(MD));
   }
     Record.push_back(VE.getTypeID(Type::getMetadataTy(N->getContext())));
     Record.push_back(VE.getMetadataID(MD));
   }

-  Stream.EmitRecord(bitc::METADATA_NODE, Record, 0);
+  Stream.EmitRecord(bitc::METADATA_OLD_NODE, Record, 0);

   Record.clear();
 }
 
   Record.clear();
 }
 

diff --git a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
index f95b2724b10323e24e838c73caa06411a2b39277..a18665964bccaa0a7c57f84950ba95dfeea88d19 100644 (file)
--- a/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
+++ b/tools/llvm-bcanalyzer/llvm-bcanalyzer.cpp
@@ -266,8 +266,8 @@ static const char *GetCodeName(unsigned CodeID, unsigned BlockID,
     case bitc::METADATA_STRING:      return "METADATA_STRING";
     case bitc::METADATA_NAME:        return "METADATA_NAME";
     case bitc::METADATA_KIND:        return "METADATA_KIND";
     case bitc::METADATA_STRING:      return "METADATA_STRING";
     case bitc::METADATA_NAME:        return "METADATA_NAME";
     case bitc::METADATA_KIND:        return "METADATA_KIND";

-    case bitc::METADATA_NODE:        return "METADATA_NODE";
-    case bitc::METADATA_FN_NODE:     return "METADATA_FN_NODE";
+    case bitc::METADATA_OLD_NODE:    return "METADATA_OLD_NODE";
+    case bitc::METADATA_OLD_FN_NODE: return "METADATA_OLD_FN_NODE";

     case bitc::METADATA_NAMED_NODE:  return "METADATA_NAMED_NODE";
     }
   case bitc::USELIST_BLOCK_ID:
     case bitc::METADATA_NAMED_NODE:  return "METADATA_NAMED_NODE";
     }
   case bitc::USELIST_BLOCK_ID: