fix comment & update functions after upstream rename

Author: OCHyams

llvm/include/llvm/Bitcode/LLVMBitCodes.h

@@ -634,7 +634,7 @@ enum FunctionCodes {
           //  DIAssignID, DIExpression (addr), ValueAsMetadata (addr)]
   FUNC_CODE_DEBUG_RECORD_VALUE_SIMPLE =
       64, // [DILocation, DILocalVariable, DIExpression, Value]
-  FUNC_CODE_DEBUG_RECORD_LABEL = 65, // DPVALUE: [DILocation, DILabel]
+  FUNC_CODE_DEBUG_RECORD_LABEL = 65, // [DILocation, DILabel]
 };
 
 enum UseListCodes {

llvm/lib/Bitcode/Reader/BitcodeReader.cpp

@@ -6406,8 +6406,8 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
         return error("Invalid dbg record: missing instruction");
       DILocation *DIL = cast<DILocation>(getFnMetadataByID(Record[0]));
       DILabel *Label = cast<DILabel>(getFnMetadataByID(Record[1]));
-      Inst->getParent()->insertDPValueBefore(new DPLabel(Label, DIL),
-                                             Inst->getIterator());
+      Inst->getParent()->insertDbgRecordBefore(
+          new DPLabel(Label, DebugLoc(DIL)), Inst->getIterator());
       continue; // This isn't an instruction.
     }
     case bitc::FUNC_CODE_DEBUG_RECORD_VALUE_SIMPLE:
@@ -6479,7 +6479,7 @@ Error BitcodeReader::parseFunctionBody(Function *F) {
       default:
         llvm_unreachable("Unknown DPValue bitcode");
       }
-      Inst->getParent()->insertDPValueBefore(DPV, Inst->getIterator());
+      Inst->getParent()->insertDbgRecordBefore(DPV, Inst->getIterator());
       continue; // This isn't an instruction.
     }
     case bitc::FUNC_CODE_INST_CALL: {

llvm/lib/Bitcode/Writer/BitcodeWriter.cpp

@@ -3532,11 +3532,11 @@ void ModuleBitcodeWriter::writeFunction(
         }
       }
 
-      // If the instruction has DPValues attached to it, emit them. Note that
+      // If the instruction has DbgRecords attached to it, emit them. Note that
       // they come after the instruction so that it's easy to attach them again
       // when reading the bitcode, even though conceptually the debug locations
       // start "before" the instruction.
-      if (I.hasDbgValues() && WriteNewDbgInfoFormatToBitcode) {
+      if (I.hasDbgRecords() && WriteNewDbgInfoFormatToBitcode) {
         /// Try to push the value only (unwrapped), otherwise push the
         /// metadata wrapped value. Returns true if the value was pushed
         /// without the ValueAsMetadata wrapper.
@@ -3562,7 +3562,7 @@ void ModuleBitcodeWriter::writeFunction(
         // Write out non-instruction debug information attached to this
         // instruction. Write it after the instruction so that it's easy to
         // re-attach to the instruction reading the records in.
-        for (DbgRecord &DR : I.DbgMarker->getDbgValueRange()) {
+        for (DbgRecord &DR : I.DbgMarker->getDbgRecordRange()) {
           if (DPLabel *DPL = dyn_cast<DPLabel>(&DR)) {
             Vals.push_back(VE.getMetadataID(&*DPL->getDebugLoc()));
             Vals.push_back(VE.getMetadataID(DPL->getLabel()));

llvm/lib/Bitcode/Writer/ValueEnumerator.cpp

@@ -144,7 +144,7 @@ static OrderMap orderModule(const Module &M) {
           }
         };
 
-        for (DPValue &DPV : DPValue::filter(I.getDbgValueRange())) {
+        for (DPValue &DPV : filterDbgVars(I.getDbgRecordRange())) {
           OrderConstantFromMetadata(DPV.getRawLocation());
           if (DPV.isDbgAssign())
             OrderConstantFromMetadata(DPV.getRawAddress());
@@ -285,7 +285,7 @@ static UseListOrderStack predictUseListOrder(const Module &M) {
       predictValueUseListOrder(&A, &F, OM, Stack);
     for (const BasicBlock &BB : F) {
       for (const Instruction &I : BB) {
-        for (DPValue &DPV : DPValue::filter(I.getDbgValueRange())) {
+        for (DPValue &DPV : filterDbgVars(I.getDbgRecordRange())) {
           PredictValueOrderFromMetadata(DPV.getRawLocation());
           if (DPV.isDbgAssign())
             PredictValueOrderFromMetadata(DPV.getRawAddress());
@@ -440,7 +440,7 @@ ValueEnumerator::ValueEnumerator(const Module &M,
             EnumerateMetadata(&F, MD);
         };
 
-        for (DbgRecord &DR : I.getDbgValueRange()) {
+        for (DbgRecord &DR : I.getDbgRecordRange()) {
           if (DPLabel *DPL = dyn_cast<DPLabel>(&DR)) {
             EnumerateMetadata(&F, DPL->getLabel());
             EnumerateMetadata(&F, &*DPL->getDebugLoc());
@@ -1128,7 +1128,7 @@ void ValueEnumerator::incorporateFunction(const Function &F) {
           AddFnLocalMetadata(MD->getMetadata());
       }
       /// RemoveDIs: Add non-instruction function-local metadata uses.
-      for (DPValue &DPV : DPValue::filter(I.getDbgValueRange())) {
+      for (DPValue &DPV : filterDbgVars(I.getDbgRecordRange())) {
         assert(DPV.getRawLocation() && "DPValue location unexpectedly null");
         AddFnLocalMetadata(DPV.getRawLocation());
         if (DPV.isDbgAssign()) {