From 922ad9fd8cbc6ff437669d676e10493e8fcece7e Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 24 Oct 2014 19:49:04 +0000 Subject: [PATCH] CodeGen: GLValue exprs in template parameters should have reference type This fixes a corner-case where __uuidof as a template argument would result in us trying to emit a GLValue as an RValue. This would lead to a crash down the road. llvm-svn: 220585 --- clang/lib/CodeGen/CGDebugInfo.cpp | 2 ++ clang/test/CodeGenCXX/debug-info-uuid.cpp | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp index a5ad633..92c2a9b 100644 --- a/clang/lib/CodeGen/CGDebugInfo.cpp +++ b/clang/lib/CodeGen/CGDebugInfo.cpp @@ -1324,6 +1324,8 @@ CollectTemplateParams(const TemplateParameterList *TPList, case TemplateArgument::Expression: { const Expr *E = TA.getAsExpr(); QualType T = E->getType(); + if (E->isGLValue()) + T = CGM.getContext().getLValueReferenceType(T); llvm::Value *V = CGM.EmitConstantExpr(E, T); assert(V && "Expression in template argument isn't constant"); llvm::DIType TTy = getOrCreateType(T, Unit); diff --git a/clang/test/CodeGenCXX/debug-info-uuid.cpp b/clang/test/CodeGenCXX/debug-info-uuid.cpp index cc1607d..5bc0489 100644 --- a/clang/test/CodeGenCXX/debug-info-uuid.cpp +++ b/clang/test/CodeGenCXX/debug-info-uuid.cpp @@ -8,7 +8,13 @@ // CHECK: [[CONST_GUID]] = {{.*}}, metadata [[GUID:![0-9]*]]} ; [ DW_TAG_const_type ] [line 0, size 0, align 0, offset 0] [from _GUID] // CHECK: [[GUID]] = {{.*}} ; [ DW_TAG_structure_type ] [_GUID] +// CHECK: metadata [[TGI2ARGS:![0-9]*]], null} ; [ DW_TAG_structure_type ] [tmpl_guid2<__uuidof(uuid)>] +// CHECK: [[TGI2ARGS]] = metadata !{metadata [[TGI2ARG1:![0-9]*]]} +// CHECK: [[TGI2ARG1]] = metadata !{metadata !"0x30\00\00{{.*}}", {{[^,]+}}, metadata [[CONST_GUID_REF:![0-9]*]], { i32, i16, i16, [8 x i8] }* @_GUID_12345678_1234_1234_1234_1234567890ab, {{.*}} ; [ DW_TAG_template_value_parameter ] +// CHECK: [[CONST_GUID_REF]] = {{.*}}, metadata [[CONST_GUID:![0-9]*]]} ; [ DW_TAG_reference_type ] [line 0, size 0, align 0, offset 0] [from ] + // CHECK-ITANIUM: metadata !"_ZTS9tmpl_guidIXadu8__uuidoft4uuidEE"} ; [ DW_TAG_structure_type ] [tmpl_guid<&__uuidof(uuid)>] +// CHECK-ITANIUM: metadata !"_ZTS10tmpl_guid2IXu8__uuidoft4uuidEE"} ; [ DW_TAG_structure_type ] [tmpl_guid2<__uuidof(uuid)>] struct _GUID; template @@ -17,3 +23,7 @@ struct tmpl_guid { struct __declspec(uuid("{12345678-1234-1234-1234-1234567890ab}")) uuid; tmpl_guid<&__uuidof(uuid)> tgi; + +template +struct tmpl_guid2 {}; +tmpl_guid2<__uuidof(uuid)> tgi2; -- 2.7.4