diff --git a/compiler/resolution/wrappers.cpp b/compiler/resolution/wrappers.cpp index ed8acbb8162b..bbcb66174252 100644 --- a/compiler/resolution/wrappers.cpp +++ b/compiler/resolution/wrappers.cpp @@ -1703,12 +1703,13 @@ static bool typeExprReturnsType(ArgSymbol* formal) { // Do not create copies for the bogus actuals added for PRIM_TO_FOLLOWER. static bool checkAnotherFunctionsFormal(FnSymbol* calleeFn, CallExpr* call, Symbol* actualSym) { + if (!isFollowerIterator(calleeFn)) return false; + bool result = isArgSymbol(actualSym) && (call->parentSymbol != actualSym->defPoint->parentSymbol); if (result && - propagateNotPOD(actualSym->getValType()) && - isFollowerIterator(calleeFn) ) + propagateNotPOD(actualSym->getValType())) USR_FATAL_CONT(calleeFn, "follower iterators accepting a non-POD argument by in-intent are not implemented"); return result; diff --git a/test/multilocale/bharshbarg/onStmtInIntent.bad b/test/multilocale/bharshbarg/onStmtInIntent.bad deleted file mode 100644 index 909541143669..000000000000 --- a/test/multilocale/bharshbarg/onStmtInIntent.bad +++ /dev/null @@ -1,2 +0,0 @@ -before: {42} -after: {999} diff --git a/test/multilocale/bharshbarg/onStmtInIntent.future b/test/multilocale/bharshbarg/onStmtInIntent.future deleted file mode 100644 index bef7f71e3868..000000000000 --- a/test/multilocale/bharshbarg/onStmtInIntent.future +++ /dev/null @@ -1 +0,0 @@ -bug: in-intent copies missing inside on-statements