This revision was landed with ongoing or failed builds. This revision was automatically updated to reflect the committed changes. Closed by commit rG75be0482a2e2: [clang][DebugInfo] Emit debuginfo for non-constant case value (authored by yonghong-song).
Repository: rG LLVM Github Monorepo CHANGES SINCE LAST ACTION https://reviews.llvm.org/D134705/new/ https://reviews.llvm.org/D134705 Files: clang/lib/CodeGen/CGStmt.cpp clang/test/CodeGen/debug-info-enum-case-val.c Index: clang/test/CodeGen/debug-info-enum-case-val.c =================================================================== --- /dev/null +++ clang/test/CodeGen/debug-info-enum-case-val.c @@ -0,0 +1,30 @@ +// RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s + +enum { A = 1 }; +int func1(int a) { + switch(a) { + case A: return 10; + default: break; + } + return 0; +} +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type +// CHECK-SAME: elements: [[TEST1_ENUMS:![0-9]*]] +// CHECK: [[TEST1_ENUMS]] = !{[[TEST1_E:![0-9]*]]} +// CHECK: [[TEST1_E]] = !DIEnumerator(name: "A", value: 1) + +// Test ImplicitCast of switch case enum value +enum { B = 2 }; +typedef unsigned long long __t1; +typedef __t1 __t2; +int func2(__t2 a) { + switch(a) { + case B: return 10; + default: break; + } + return 0; +} +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type +// CHECK-SAME: elements: [[TEST2_ENUMS:![0-9]*]] +// CHECK: [[TEST2_ENUMS]] = !{[[TEST2_E:![0-9]*]]} +// CHECK: [[TEST2_E]] = !DIEnumerator(name: "B", value: 2) Index: clang/lib/CodeGen/CGStmt.cpp =================================================================== --- clang/lib/CodeGen/CGStmt.cpp +++ clang/lib/CodeGen/CGStmt.cpp @@ -1509,6 +1509,21 @@ llvm::ConstantInt *CaseVal = Builder.getInt(S.getLHS()->EvaluateKnownConstInt(getContext())); + + // Emit debuginfo for the case value if it is an enum value. + const ConstantExpr *CE; + if (auto ICE = dyn_cast<ImplicitCastExpr>(S.getLHS())) + CE = dyn_cast<ConstantExpr>(ICE->getSubExpr()); + else + CE = dyn_cast<ConstantExpr>(S.getLHS()); + if (CE) { + if (auto DE = dyn_cast<DeclRefExpr>(CE->getSubExpr())) + if (CGDebugInfo *Dbg = getDebugInfo()) + if (CGM.getCodeGenOpts().hasReducedDebugInfo()) + Dbg->EmitGlobalVariable(DE->getDecl(), + APValue(llvm::APSInt(CaseVal->getValue()))); + } + if (SwitchLikelihood) SwitchLikelihood->push_back(Stmt::getLikelihood(Attrs));
Index: clang/test/CodeGen/debug-info-enum-case-val.c =================================================================== --- /dev/null +++ clang/test/CodeGen/debug-info-enum-case-val.c @@ -0,0 +1,30 @@ +// RUN: %clang_cc1 -emit-llvm -debug-info-kind=limited %s -o - | FileCheck %s + +enum { A = 1 }; +int func1(int a) { + switch(a) { + case A: return 10; + default: break; + } + return 0; +} +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type +// CHECK-SAME: elements: [[TEST1_ENUMS:![0-9]*]] +// CHECK: [[TEST1_ENUMS]] = !{[[TEST1_E:![0-9]*]]} +// CHECK: [[TEST1_E]] = !DIEnumerator(name: "A", value: 1) + +// Test ImplicitCast of switch case enum value +enum { B = 2 }; +typedef unsigned long long __t1; +typedef __t1 __t2; +int func2(__t2 a) { + switch(a) { + case B: return 10; + default: break; + } + return 0; +} +// CHECK: !DICompositeType(tag: DW_TAG_enumeration_type +// CHECK-SAME: elements: [[TEST2_ENUMS:![0-9]*]] +// CHECK: [[TEST2_ENUMS]] = !{[[TEST2_E:![0-9]*]]} +// CHECK: [[TEST2_E]] = !DIEnumerator(name: "B", value: 2) Index: clang/lib/CodeGen/CGStmt.cpp =================================================================== --- clang/lib/CodeGen/CGStmt.cpp +++ clang/lib/CodeGen/CGStmt.cpp @@ -1509,6 +1509,21 @@ llvm::ConstantInt *CaseVal = Builder.getInt(S.getLHS()->EvaluateKnownConstInt(getContext())); + + // Emit debuginfo for the case value if it is an enum value. + const ConstantExpr *CE; + if (auto ICE = dyn_cast<ImplicitCastExpr>(S.getLHS())) + CE = dyn_cast<ConstantExpr>(ICE->getSubExpr()); + else + CE = dyn_cast<ConstantExpr>(S.getLHS()); + if (CE) { + if (auto DE = dyn_cast<DeclRefExpr>(CE->getSubExpr())) + if (CGDebugInfo *Dbg = getDebugInfo()) + if (CGM.getCodeGenOpts().hasReducedDebugInfo()) + Dbg->EmitGlobalVariable(DE->getDecl(), + APValue(llvm::APSInt(CaseVal->getValue()))); + } + if (SwitchLikelihood) SwitchLikelihood->push_back(Stmt::getLikelihood(Attrs));
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits