merge D2 pull #1021

dlang · Jun 21, 2012 · c78e64b · c78e64b
1 parent 8438373
commit c78e64b
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/src/interpret.c b/src/interpret.c
@@ -1916,19 +1916,20 @@ Expression * resolveReferences(Expression *e, Expression *thisval)
         {
             VarExp *ve = (VarExp *)e;
             VarDeclaration *v = ve->var->isVarDeclaration();
+            assert(v);
             if (v->type->ty == Tpointer)
                 break;
             if (v->ctfeAdrOnStack == (size_t)-1) // If not on the stack, can't possibly be a ref.
                 break;
-            if (v && v->getValue() && (v->getValue()->op == TOKslice))
+            if (v->getValue() && (v->getValue()->op == TOKslice))
             {
                 SliceExp *se = (SliceExp *)v->getValue();
                 if (se->e1->op == TOKarrayliteral || se->e1->op == TOKassocarrayliteral || se->e1->op == TOKstring)
                     break;
                 e = v->getValue();
                 continue;
             }
-            else if (v && v->getValue() && (v->getValue()->op==TOKindex || v->getValue()->op == TOKdotvar
+            else if (v->getValue() && (v->getValue()->op==TOKindex || v->getValue()->op == TOKdotvar
                   || v->getValue()->op == TOKthis ))
             {
                 e = v->getValue();
@@ -5557,7 +5558,7 @@ Expression *IndexExp::interpret(InterState *istate, CtfeGoal goal)
         if ( agg->op == TOKarrayliteral || agg->op == TOKstring)
         {
             dinteger_t len = ArrayLength(Type::tsize_t, agg)->toInteger();
-            Type *pointee = ((TypePointer *)agg->type)->next;
+            //Type *pointee = ((TypePointer *)agg->type)->next;
             if ((indx + ofs) < 0 || (indx+ofs) > len)
             {
                 error("pointer index [%lld] exceeds allocated memory block [0..%lld]",
@@ -5726,7 +5727,7 @@ Expression *SliceExp::interpret(InterState *istate, CtfeGoal goal)
         }
         assert(agg->op == TOKarrayliteral || agg->op == TOKstring);
         dinteger_t len = ArrayLength(Type::tsize_t, agg)->toInteger();
-        Type *pointee = ((TypePointer *)agg->type)->next;
+        //Type *pointee = ((TypePointer *)agg->type)->next;
         if ((ilwr + ofs) < 0 || (iupr+ofs) > (len + 1) || iupr < ilwr)
         {
             error("pointer slice [%lld..%lld] exceeds allocated memory block [0..%lld]",