[llvm] r359093 - [LLVM-C] Use dyn_cast instead of unwrap in LLVMGetDebugLoc functions
whitequark via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 24 06:30:03 PDT 2019
Author: whitequark
Date: Wed Apr 24 06:30:03 2019
New Revision: 359093
URL: http://llvm.org/viewvc/llvm-project?rev=359093&view=rev
Log:
[LLVM-C] Use dyn_cast instead of unwrap in LLVMGetDebugLoc functions
Summary:
The `unwrap<Type>` calls can assert with:
```
Assertion failed: (isa<X>(Val) && "cast<Ty>() argument of incompatible type!"), function cast
```
so replace them with `dyn_cast`.
Reviewers: whitequark, abdulras, hiraditya, compnerd
Reviewed By: whitequark
Subscribers: llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D60473
Modified:
llvm/trunk/lib/IR/Core.cpp
Modified: llvm/trunk/lib/IR/Core.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/IR/Core.cpp?rev=359093&r1=359092&r2=359093&view=diff
==============================================================================
--- llvm/trunk/lib/IR/Core.cpp (original)
+++ llvm/trunk/lib/IR/Core.cpp Wed Apr 24 06:30:03 2019
@@ -1199,15 +1199,17 @@ void LLVMAddNamedMetadataOperand(LLVMMod
const char *LLVMGetDebugLocDirectory(LLVMValueRef Val, unsigned *Length) {
if (!Length) return nullptr;
StringRef S;
- if (const auto *I = unwrap<Instruction>(Val)) {
- S = I->getDebugLoc()->getDirectory();
- } else if (const auto *GV = unwrap<GlobalVariable>(Val)) {
+ if (const auto *I = dyn_cast<Instruction>(unwrap(Val))) {
+ if (const auto &DL = I->getDebugLoc()) {
+ S = DL->getDirectory();
+ }
+ } else if (const auto *GV = dyn_cast<GlobalVariable>(unwrap(Val))) {
SmallVector<DIGlobalVariableExpression *, 1> GVEs;
GV->getDebugInfo(GVEs);
if (GVEs.size())
if (const DIGlobalVariable *DGV = GVEs[0]->getVariable())
S = DGV->getDirectory();
- } else if (const auto *F = unwrap<Function>(Val)) {
+ } else if (const auto *F = dyn_cast<Function>(unwrap(Val))) {
if (const DISubprogram *DSP = F->getSubprogram())
S = DSP->getDirectory();
} else {
@@ -1221,15 +1223,17 @@ const char *LLVMGetDebugLocDirectory(LLV
const char *LLVMGetDebugLocFilename(LLVMValueRef Val, unsigned *Length) {
if (!Length) return nullptr;
StringRef S;
- if (const auto *I = unwrap<Instruction>(Val)) {
- S = I->getDebugLoc()->getFilename();
- } else if (const auto *GV = unwrap<GlobalVariable>(Val)) {
+ if (const auto *I = dyn_cast<Instruction>(unwrap(Val))) {
+ if (const auto &DL = I->getDebugLoc()) {
+ S = DL->getFilename();
+ }
+ } else if (const auto *GV = dyn_cast<GlobalVariable>(unwrap(Val))) {
SmallVector<DIGlobalVariableExpression *, 1> GVEs;
GV->getDebugInfo(GVEs);
if (GVEs.size())
if (const DIGlobalVariable *DGV = GVEs[0]->getVariable())
S = DGV->getFilename();
- } else if (const auto *F = unwrap<Function>(Val)) {
+ } else if (const auto *F = dyn_cast<Function>(unwrap(Val))) {
if (const DISubprogram *DSP = F->getSubprogram())
S = DSP->getFilename();
} else {
@@ -1242,15 +1246,17 @@ const char *LLVMGetDebugLocFilename(LLVM
unsigned LLVMGetDebugLocLine(LLVMValueRef Val) {
unsigned L = 0;
- if (const auto *I = unwrap<Instruction>(Val)) {
- L = I->getDebugLoc()->getLine();
- } else if (const auto *GV = unwrap<GlobalVariable>(Val)) {
+ if (const auto *I = dyn_cast<Instruction>(unwrap(Val))) {
+ if (const auto &DL = I->getDebugLoc()) {
+ L = DL->getLine();
+ }
+ } else if (const auto *GV = dyn_cast<GlobalVariable>(unwrap(Val))) {
SmallVector<DIGlobalVariableExpression *, 1> GVEs;
GV->getDebugInfo(GVEs);
if (GVEs.size())
if (const DIGlobalVariable *DGV = GVEs[0]->getVariable())
L = DGV->getLine();
- } else if (const auto *F = unwrap<Function>(Val)) {
+ } else if (const auto *F = dyn_cast<Function>(unwrap(Val))) {
if (const DISubprogram *DSP = F->getSubprogram())
L = DSP->getLine();
} else {
@@ -1262,9 +1268,9 @@ unsigned LLVMGetDebugLocLine(LLVMValueRe
unsigned LLVMGetDebugLocColumn(LLVMValueRef Val) {
unsigned C = 0;
- if (const auto *I = unwrap<Instruction>(Val))
- if (const auto &L = I->getDebugLoc())
- C = L->getColumn();
+ if (const auto *I = dyn_cast<Instruction>(unwrap(Val)))
+ if (const auto &DL = I->getDebugLoc())
+ C = DL->getColumn();
return C;
}
More information about the llvm-commits
mailing list