diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfExpression.cpp
@@ -393,10 +393,13 @@
     auto Op = ExprCursor.take();
     uint64_t OpNum = Op->getOp();
 
-    if (OpNum >= dwarf::DW_OP_reg0 && OpNum <= dwarf::DW_OP_reg31) {
+    if ((OpNum >= dwarf::DW_OP_reg0 && OpNum <= dwarf::DW_OP_reg31) ||
+        (OpNum >= dwarf::DW_OP_lit0 && OpNum <= dwarf::DW_OP_lit31)) {
       emitOp(OpNum);
       continue;
-    } else if (OpNum >= dwarf::DW_OP_breg0 && OpNum <= dwarf::DW_OP_breg31) {
+    }
+
+    if (OpNum >= dwarf::DW_OP_breg0 && OpNum <= dwarf::DW_OP_breg31) {
       addBReg(OpNum - dwarf::DW_OP_breg0, Op->getArg(0));
       continue;
     }
@@ -448,7 +451,6 @@
     case dwarf::DW_OP_shl:
     case dwarf::DW_OP_shr:
     case dwarf::DW_OP_shra:
-    case dwarf::DW_OP_lit0:
     case dwarf::DW_OP_not:
     case dwarf::DW_OP_dup:
       emitOp(OpNum);
diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp
--- a/llvm/lib/IR/DebugInfoMetadata.cpp
+++ b/llvm/lib/IR/DebugInfoMetadata.cpp
@@ -885,6 +885,9 @@
         (Op >= dwarf::DW_OP_breg0 && Op <= dwarf::DW_OP_breg31))
       return true;
 
+    if (Op >= dwarf::DW_OP_lit0 && Op <= dwarf::DW_OP_lit31)
+      continue;
+
     // Check that the operand is valid.
     switch (Op) {
     default:
@@ -940,7 +943,6 @@
     case dwarf::DW_OP_deref:
     case dwarf::DW_OP_deref_size:
     case dwarf::DW_OP_xderef:
-    case dwarf::DW_OP_lit0:
     case dwarf::DW_OP_not:
     case dwarf::DW_OP_dup:
     case dwarf::DW_OP_regx:
diff --git a/llvm/test/DebugInfo/dwarfdump-litN.ll b/llvm/test/DebugInfo/dwarfdump-litN.ll
new file mode 100644
--- /dev/null
+++ b/llvm/test/DebugInfo/dwarfdump-litN.ll
@@ -0,0 +1,71 @@
+; This test checks whether DW_OP_litN is accepted and
+; processed.
+
+; RUN: %llc_dwarf %s -O2 -filetype=obj -o %t.o
+; RUN: llvm-dwarfdump  %t.o | FileCheck %s
+
+; CHECK-LABEL:  DW_AT_name    ("var1")
+
+; 1. Test whether DW_OP_lit0 still works.
+; CHECK-LABEL:       DW_TAG_variable
+; CHECK:        DW_AT_location        (DW_OP_lit13, DW_OP_lit0, DW_OP_mul, DW_OP_stack_value)
+; CHECK-NEXT:   DW_AT_name    ("var2")
+
+; 2. Test whether DW_OP_lit5 works.
+; CHECK-LABEL:       DW_TAG_variable
+; CHECK:        DW_AT_location        (DW_OP_lit13, DW_OP_lit5, DW_OP_mul, DW_OP_stack_value)
+; CHECK-NEXT:   DW_AT_name    ("var3")
+
+; Below is the original test case this IR is generated from
+;---------------------------
+;int main() {
+;  int var1 = 10, var2 = (var1+3)*0, var3 = (var1+3)*5;
+;  int *ptr1;
+;  ptr1 = &var1;
+;  return *ptr1;
+;}
+;---------------------------
+; step 1: generate IR using -g -O2 -S -emit-llvm
+; step 2: replace DW_OP_constu, 0 with DW_OP_lit0
+; step 3: replace DW_OP_constu, 5 with DW_OP_lit5
+;---------------------------
+
+; ModuleID = 'dwarfdump-litN.c'
+source_filename = "dwarfdump-litN.c"
+target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+
+; Function Attrs: norecurse nounwind readnone uwtable
+define dso_local i32 @main() local_unnamed_addr !dbg !7 {
+entry:
+  call void @llvm.dbg.value(metadata i32 10, metadata !12, metadata !DIExpression()), !dbg !17
+  call void @llvm.dbg.value(metadata i32 13, metadata !13, metadata !DIExpression(DW_OP_lit0, DW_OP_mul, DW_OP_stack_value)), !dbg !17
+  call void @llvm.dbg.value(metadata i32 13, metadata !14, metadata !DIExpression(DW_OP_lit5, DW_OP_mul, DW_OP_stack_value)), !dbg !17
+  ret i32 10, !dbg !18
+}
+
+; Function Attrs: nounwind readnone speculatable willreturn
+declare void @llvm.dbg.value(metadata, metadata, metadata)
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4, !5}
+!llvm.ident = !{!6}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 11.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
+!1 = !DIFile(filename: "dwarfdump-litN.c", directory: "/dir")
+!2 = !{}
+!3 = !{i32 7, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{i32 1, !"wchar_size", i32 4}
+!6 = !{!"clang version 11.0.0"}
+!7 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 1, type: !8, scopeLine: 1, flags: DIFlagAllCallsDescribed, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0, retainedNodes: !11)
+!8 = !DISubroutineType(types: !9)
+!9 = !{!10}
+!10 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!11 = !{!12, !13, !14, !15}
+!12 = !DILocalVariable(name: "var1", scope: !7, file: !1, line: 2, type: !10)
+!13 = !DILocalVariable(name: "var2", scope: !7, file: !1, line: 2, type: !10)
+!14 = !DILocalVariable(name: "var3", scope: !7, file: !1, line: 2, type: !10)
+!15 = !DILocalVariable(name: "ptr1", scope: !7, file: !1, line: 3, type: !16)
+!16 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !10, size: 64)
+!17 = !DILocation(line: 0, scope: !7)
+!18 = !DILocation(line: 5, column: 3, scope: !7)