Merge dmd 1.056.

dmd/declaration.c

@@ -835,7 +835,7 @@ void VarDeclaration::semantic(Scope *sc)
 	    //printf("declaring field %s of type %s\n", v->toChars(), v->type->toChars());
 	    v->semantic(sc);
             
-/*
+#if !IN_LLVM
 // removed for LDC since TupleDeclaration::toObj already creates the fields;
 // adding them to the scope again leads to duplicates
 	    if (sc->scopesym)
@@ -843,7 +843,8 @@ void VarDeclaration::semantic(Scope *sc)
 		if (sc->scopesym->members)
 		    sc->scopesym->members->push(v);
 	    }
-*/
+#endif
+
 	    Expression *e = new DsymbolExp(loc, v);
 	    exps->data[i] = e;
 	}
@@ -1490,9 +1491,10 @@ Dsymbol *TypeInfoDeclaration::syntaxCopy(Dsymbol *s)
 void TypeInfoDeclaration::semantic(Scope *sc)
 {
     assert(linkage == LINKc);
-    // LDC
+#if IN_LLVM
     if (!global.params.useAvailableExternally)
         availableExternally = false;
+#endif
 }
 
 /***************************** TypeInfoConstDeclaration **********************/