Parser fixes

Author: SLTozer

llvm/lib/AsmParser/LLParser.cpp

@@ -6564,18 +6564,16 @@ bool LLParser::parseDebugRecord(DbgRecord *&DR, PerFunctionState &PFS) {
 
   // Parse Expression field.
   LocTy ExprLoc = Lex.getLoc();
-  Metadata *Expression;
-  if (parseMetadata(Expression, &PFS))
+  MDNode *Expression;
+  if (parseMDNode(Expression))
     return true;
-  if (!isa<DIExpression>(Expression))
-    return error(ExprLoc, "expected valid inline DIExpression here");
   if (parseToken(lltok::comma, "Expected ',' here"))
     return true;
 
   // Parse additional fields for #dbg_assign.
   MDNode *AssignID = nullptr;
   Metadata *AddressLocation = nullptr;
-  Metadata *AddressExpression = nullptr;
+  MDNode *AddressExpression = nullptr;
   if (ValueType == LocType::Assign) {
     // Parse DIAssignID.
     if (parseMDNode(AssignID))
@@ -6591,10 +6589,8 @@ bool LLParser::parseDebugRecord(DbgRecord *&DR, PerFunctionState &PFS) {
 
     // Parse address DIExpression.
     LocTy AddressExprLoc = Lex.getLoc();
-    if (parseMetadata(AddressExpression, &PFS))
+    if (parseMDNode(AddressExpression))
       return true;
-    if (!isa<DIExpression>(AddressExpression))
-      return error(AddressExprLoc, "expected valid inline DIExpression here");
     if (parseToken(lltok::comma, "Expected ',' here"))
       return true;
   }
@@ -6607,8 +6603,8 @@ bool LLParser::parseDebugRecord(DbgRecord *&DR, PerFunctionState &PFS) {
   if (parseToken(lltok::rparen, "Expected ')' here"))
     return true;
   DR = DPValue::createUnresolvedDPValue(
-      ValueType, ValLocMD, Variable, cast<DIExpression>(Expression), AssignID,
-      AddressLocation, cast_or_null<DIExpression>(AddressExpression), DebugLoc);
+      ValueType, ValLocMD, Variable, Expression, AssignID,
+      AddressLocation, AddressExpression, DebugLoc);
   return false;
 }
 //===----------------------------------------------------------------------===//

llvm/lib/IR/DebugProgramInstruction.cpp

@@ -142,7 +142,7 @@ DbgRecord::createDebugIntrinsic(Module *M, Instruction *InsertBefore) const {
 DPLabel::DPLabel(MDNode *Label, MDNode *DL)
     : DbgRecord(LabelKind, DebugLoc(DL)), Label(Label) {
   assert(Label && "Unexpected nullptr");
-  assert(isa<DILabel>(Label) || Label->isTemporary() && "Label type must be or resolve to a DILabel");
+  assert((isa<DILabel>(Label) || Label->isTemporary()) && "Label type must be or resolve to a DILabel");
 }
 DPLabel::DPLabel(DILabel *Label, DebugLoc DL)
     : DbgRecord(LabelKind, DL), Label(Label) {
@@ -156,9 +156,8 @@ DPLabel *DPLabel::createUnresolvedDPLabel(MDNode *Label, MDNode *DL) {
 DPValue::DPValue(DPValue::LocationType Type, Metadata *Val, MDNode *Variable,
                  MDNode *Expression, MDNode *AssignID, Metadata *Address,
                  MDNode *AddressExpression, MDNode *DI)
-    : DbgRecord(ValueKind, DebugLoc(DI)), DebugValueUser({Val, Address, AssignID}), Variable(Variable),
-      Expression(Expression), AddressExpression(AddressExpression),
-      Type(Type) {}
+    : DbgRecord(ValueKind, DebugLoc(DI)), DebugValueUser({Val, Address, AssignID}), Type(Type), Variable(Variable),
+      Expression(Expression), AddressExpression(AddressExpression) {}
 
 DPValue *DPValue::createUnresolvedDPValue(DPValue::LocationType Type,
                                           Metadata *Val, MDNode *Variable,