diff options
Diffstat (limited to 'llvm/lib/IR')
| -rw-r--r-- | llvm/lib/IR/DIBuilder.cpp | 10 | ||||
| -rw-r--r-- | llvm/lib/IR/DebugInfo.cpp | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/llvm/lib/IR/DIBuilder.cpp b/llvm/lib/IR/DIBuilder.cpp index f193e5331dd..2cb27cae144 100644 --- a/llvm/lib/IR/DIBuilder.cpp +++ b/llvm/lib/IR/DIBuilder.cpp @@ -503,13 +503,14 @@ DIBuilder::createObjCProperty(StringRef Name, DIFile File, unsigned LineNumber, DITemplateTypeParameter DIBuilder::createTemplateTypeParameter(DIDescriptor Context, StringRef Name, DIType Ty) { + assert(!DIScope(getNonCompileUnitScope(Context)).getRef() && + "Expected compile unit"); Metadata *Elts[] = {HeaderBuilder::get(dwarf::DW_TAG_template_type_parameter) .concat(Name) .concat(0) .concat(0) .get(VMContext), - DIScope(getNonCompileUnitScope(Context)).getRef(), - Ty.getRef(), nullptr}; + nullptr, Ty.getRef(), nullptr}; return DITemplateTypeParameter(MDNode::get(VMContext, Elts)); } @@ -517,10 +518,11 @@ static DITemplateValueParameter createTemplateValueParameterHelper(LLVMContext &VMContext, unsigned Tag, DIDescriptor Context, StringRef Name, DIType Ty, Metadata *MD) { + assert(!DIScope(getNonCompileUnitScope(Context)).getRef() && + "Expected compile unit"); Metadata *Elts[] = { HeaderBuilder::get(Tag).concat(Name).concat(0).concat(0).get(VMContext), - DIScope(getNonCompileUnitScope(Context)).getRef(), Ty.getRef(), MD, - nullptr}; + nullptr, Ty.getRef(), MD, nullptr}; return DITemplateValueParameter(MDNode::get(VMContext, Elts)); } diff --git a/llvm/lib/IR/DebugInfo.cpp b/llvm/lib/IR/DebugInfo.cpp index 92d7e4590a9..f682ad548f2 100644 --- a/llvm/lib/IR/DebugInfo.cpp +++ b/llvm/lib/IR/DebugInfo.cpp @@ -1117,11 +1117,9 @@ void DebugInfoFinder::processSubprogram(DISubprogram SP) { DIDescriptor Element = TParams.getElement(I); if (Element.isTemplateTypeParameter()) { DITemplateTypeParameter TType(Element); - processScope(TType.getContext().resolve(TypeIdentifierMap)); processType(TType.getType().resolve(TypeIdentifierMap)); } else if (Element.isTemplateValueParameter()) { DITemplateValueParameter TVal(Element); - processScope(TVal.getContext().resolve(TypeIdentifierMap)); processType(TVal.getType().resolve(TypeIdentifierMap)); } } |
