[PATCH] D57524: Fix ICE on attempt to add an addr space qual to a type qualified by an addr space
Anastasia Stulova via Phabricator via cfe-commits
cfe-commits at lists.llvm.org
Thu Jan 31 09:42:45 PST 2019
Anastasia created this revision.
Anastasia added a reviewer: rjmccall.
If `cv2T2` has an address space and we are creating a qualified type `cv1T4` adding new addr space qualifier an ICE is triggered.
To avoid this ICE we first create a duplicate of `cv2T2` omitting its original addr space. Then we can safely use it to create combined type to use in the conversion.
This is the last patch that allows fixing PR38614!
https://reviews.llvm.org/D57524
Files:
lib/Sema/SemaInit.cpp
test/SemaOpenCLCXX/address-space-of-this.cl
Index: test/SemaOpenCLCXX/address-space-of-this.cl
===================================================================
--- /dev/null
+++ test/SemaOpenCLCXX/address-space-of-this.cl
@@ -0,0 +1,14 @@
+// RUN: %clang_cc1 %s -triple spir-unknown-unknown -cl-std=c++ -pedantic -verify -fsyntax-only
+// expected-no-diagnostics
+
+// Extract from PR38614
+struct C {};
+
+C f1() {
+ return C{};
+}
+
+C f2(){
+ C c;
+ return c;
+}
Index: lib/Sema/SemaInit.cpp
===================================================================
--- lib/Sema/SemaInit.cpp
+++ lib/Sema/SemaInit.cpp
@@ -4672,17 +4672,26 @@
// conversion to allow creating temporaries in the alloca address space.
auto AS1 = T1Quals.getAddressSpace();
auto AS2 = T2Quals.getAddressSpace();
- T1Quals.removeAddressSpace();
- T2Quals.removeAddressSpace();
+ if (AS1 != AS2) {
+ T1Quals.removeAddressSpace();
+ T2Quals.removeAddressSpace();
+ }
QualType cv1T4 = S.Context.getQualifiedType(cv2T2, T1Quals);
if (T1Quals != T2Quals)
Sequence.AddQualificationConversionStep(cv1T4, ValueKind);
Sequence.AddReferenceBindingStep(cv1T4, ValueKind == VK_RValue);
ValueKind = isLValueRef ? VK_LValue : VK_XValue;
if (AS1 != AS2) {
- T1Quals.addAddressSpace(AS1);
- QualType cv1AST4 = S.Context.getQualifiedType(cv2T2, T1Quals);
- Sequence.AddQualificationConversionStep(cv1AST4, ValueKind);
+ if (AS1 != LangAS::Default)
+ T1Quals.addAddressSpace(AS1);
+ // If there has been an addr space qualifier on cv2T2 we will fail
+ // to create a new type. To avoid this we re-create the type ignoring
+ // addr spaces first.
+ auto IgnoreAScv2T2 = S.Context.getQualifiedType(T2, T2Quals);
+ if (AS2 != LangAS::Default)
+ T2Quals.addAddressSpace(AS2);
+ QualType WithAScv1T4 = S.Context.getQualifiedType(IgnoreAScv2T2, T1Quals);
+ Sequence.AddQualificationConversionStep(WithAScv1T4, ValueKind);
}
// In any case, the reference is bound to the resulting glvalue (or to
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D57524.184530.patch
Type: text/x-patch
Size: 2063 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20190131/65b178fd/attachment.bin>
More information about the cfe-commits
mailing list