Merge pull request #3179 from 9rnsr/fix12038

Issue 12038 - alias this and &this cause ICE
dlang · Jan 31, 2014 · 7e97423 · 7e97423
2 parents 23f9312 + 033a1bf
commit 7e97423
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/src/mtype.c b/src/mtype.c
@@ -8741,7 +8741,7 @@ unsigned char TypeStruct::deduceWild(Type *t, bool isRef)
 
     unsigned char wm = 0;
 
-    if (sym->aliasthis && !(att & RECtracing))
+    if (t->hasWild() && sym->aliasthis && !(att & RECtracing))
     {
         att = (AliasThisRec)(att | RECtracing);
         wm = aliasthisOf()->deduceWild(t, isRef);
@@ -9285,7 +9285,7 @@ unsigned char TypeClass::deduceWild(Type *t, bool isRef)
 
     unsigned char wm = 0;
 
-    if (sym->aliasthis && !(att & RECtracing))
+    if (t->hasWild() && sym->aliasthis && !(att & RECtracing))
     {
         att = (AliasThisRec)(att | RECtracing);
         wm = aliasthisOf()->deduceWild(t, isRef);

diff --git a/test/runnable/aliasthis.d b/test/runnable/aliasthis.d
@@ -1674,6 +1674,17 @@ struct Group12008
     RefCounted12008!SharedInput12008 _allGroups;
 }
 
+/***************************************************/
+// 12038
+
+bool f12038(void* p) { return true; }
+
+struct S12038
+{
+    @property p() { f12038(&this); }
+    alias p this;
+}
+
 /***************************************************/
 
 int main()