Merge pull request #6535 from ibuclaw/nullchecks

ThisExp.var is always a VarDeclaration in checkEscape.
dlang · May 6, 2017 · 6c72a7b · 6c72a7b
2 parents e29443f + 4b75387
commit 6c72a7b
Showing 1 changed file with 4 additions and 6 deletions.
diff --git a/src/ddmd/escape.d b/src/ddmd/escape.d
@@ -705,9 +705,8 @@ private void escapeByValue(Expression e, EscapeByResults* er)
 
         override void visit(ThisExp e)
         {
-            VarDeclaration v = e.var.isVarDeclaration();
-            if (v)
-                er.byvalue.push(v);
+            if (e.var)
+                er.byvalue.push(e.var);
         }
 
         override void visit(DotVarExp e)
@@ -981,9 +980,8 @@ private void escapeByRef(Expression e, EscapeByResults* er)
 
         override void visit(ThisExp e)
         {
-            auto v = e.var.isVarDeclaration();
-            if (v)
-                er.byref.push(v);
+            if (e.var)
+                er.byref.push(e.var);
         }
 
         override void visit(PtrExp e)