Merge pull request #4775 from WalterBright/fix14430

fix Issue 14430 - [REG2.060] Null parameter is detected as non-null
dlang · Jun 26, 2015 · 1ea328e · 1ea328e
2 parents ad63ba2 + b53c44e
commit 1ea328e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/backend/cod1.c b/src/backend/cod1.c
@@ -4249,8 +4249,8 @@ code *loaddata(elem *e,regm_t *pretregs)
         }
         else if (I64 && sz == 16)
         {
-            ce = movregconst(CNIL,findreglsw(forregs),e->EV.Vcent.lsw,0);
-            ce = movregconst(ce,findregmsw(forregs),e->EV.Vcent.msw,0);
+            ce = movregconst(CNIL,findreglsw(forregs),e->EV.Vcent.lsw,64);
+            ce = movregconst(ce,findregmsw(forregs),e->EV.Vcent.msw,64);
         }
         else
             assert(0);

diff --git a/test/runnable/test42.d b/test/runnable/test42.d
@@ -5983,6 +5983,17 @@ label:
     assert(s.num == 10);
 }
 
+/***************************************************/
+// 14430
+
+void setCookie(long x = 1L << 32L, string y = null){
+    assert(y.ptr is null);
+}
+
+void test14430(){
+    setCookie();
+}
+
 /***************************************************/
 
 int main()
@@ -6277,6 +6288,7 @@ int main()
     test10642();
     test7436();
     test12138();
+    test14430();
 
     writefln("Success");
     return 0;