From dda19a61410fd6d0e44c8f4749f849e2ea39ed7e Mon Sep 17 00:00:00 2001 From: Daniel Murphy Date: Fri, 8 Nov 2013 22:55:27 +1100 Subject: [PATCH] Don't shadow variable 't' in FuncDeclaration::semantic3 --- src/func.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/func.c b/src/func.c index 169020dd965f..35db26780672 100644 --- a/src/func.c +++ b/src/func.c @@ -1028,8 +1028,6 @@ void FuncDeclaration::semantic3(Scope *sc) // Declare hidden variable _arguments[] and _argptr if (f->varargs == 1) { - Type *t; - #ifndef IN_GCC if (global.params.is64bit && !global.params.isWindows) { // Declare save area for varargs registers @@ -1058,8 +1056,8 @@ void FuncDeclaration::semantic3(Scope *sc) sc2->insert(v_arguments); v_arguments->parent = this; - //t = Type::typeinfo->type->constOf()->arrayOf(); - t = Type::dtypeinfo->type->arrayOf(); + //Type *t = Type::typeinfo->type->constOf()->arrayOf(); + Type *t = Type::dtypeinfo->type->arrayOf(); _arguments = new VarDeclaration(Loc(), t, Id::_arguments, NULL); _arguments->semantic(sc2); sc2->insert(_arguments); @@ -1067,7 +1065,7 @@ void FuncDeclaration::semantic3(Scope *sc) } if (f->linkage == LINKd || (f->parameters && Parameter::dim(f->parameters))) { // Declare _argptr - t = Type::tvalist; + Type *t = Type::tvalist; argptr = new VarDeclaration(Loc(), t, Id::_argptr, NULL); argptr->semantic(sc2); sc2->insert(argptr);