luke
/
iverilog
mirror of https://github.com/steveicarus/iverilog.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix for br961 - function return type elaborated in wrong scope. 

The return type of a function should be elaborated in the context of
the enclosing scope, not in the context of the function itself.
This commit is contained in:
Martin Whitaker 2014-10-30 21:37:31 +00:00
parent 68e6fb48c9
commit a75fc86cb1
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
elab_sig.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000-2010 Stephen Williams (steve@icarus.com) * Copyright (c) 2000-2014 Stephen Williams (steve@icarus.com)
* *
* This source code is free software; you can redistribute it * This source code is free software; you can redistribute it
* and/or modify it in source code form under the terms of the GNU * and/or modify it in source code form under the terms of the GNU
@ -579,14 +579,16 @@ void PFunction::elaborate_sig(Design*des, NetScope*scope) const
case PTF_REG: case PTF_REG:
case PTF_REG_S: case PTF_REG_S:
if (return_type_.range) { if (return_type_.range) {
probe_expr_width(des, scope, (*return_type_.range)[0]); NetScope*parent = scope->parent();
probe_expr_width(des, scope, (*return_type_.range)[1]);
probe_expr_width(des, parent, (*return_type_.range)[0]);
probe_expr_width(des, parent, (*return_type_.range)[1]);
need_constant_expr = true; need_constant_expr = true;
NetExpr*me = elab_and_eval(des, scope, NetExpr*me = elab_and_eval(des, parent,
(*return_type_.range)[0], -1); (*return_type_.range)[0], -1);
assert(me); assert(me);
NetExpr*le = elab_and_eval(des, scope, NetExpr*le = elab_and_eval(des, parent,
(*return_type_.range)[1], -1); (*return_type_.range)[1], -1);
assert(le); assert(le);
need_constant_expr = false; need_constant_expr = false;