File size: 3,400 Bytes
62cfde8 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | diff --git a/tests/parser/functions/test_raw_call.py b/tests/parser/functions/test_raw_call.py
index 4fbff331..95db070f 100644
--- a/tests/parser/functions/test_raw_call.py
+++ b/tests/parser/functions/test_raw_call.py
@@ -296,8 +296,10 @@ baz: int128
def fail1(should_raise: bool):
if should_raise:
raise "fail"
+
# test both paths for raw_call -
# they are different depending if callee has or doesn't have returntype
+# (fail2 fails because of staticcall)
@external
def fail2(should_raise: bool) -> int128:
if should_raise:
@@ -320,6 +322,7 @@ def foo(_addr: address, should_raise: bool) -> uint256:
)
assert success == (not should_raise)
return 1
+
@external
@view
def bar(_addr: address, should_raise: bool) -> uint256:
@@ -334,6 +337,19 @@ def bar(_addr: address, should_raise: bool) -> uint256:
)
assert success == (not should_raise)
return 2
+
+# test max_outsize not set case
+@external
+@nonpayable
+def baz(_addr: address, should_raise: bool) -> uint256:
+ success: bool = True
+ success = raw_call(
+ _addr,
+ _abi_encode(should_raise, method_id=method_id("fail1(bool)")),
+ revert_on_failure=False,
+ )
+ assert success == (not should_raise)
+ return 3
"""
target = get_contract(target_source)
@@ -343,6 +359,8 @@ def bar(_addr: address, should_raise: bool) -> uint256:
assert caller.foo(target.address, False) == 1
assert caller.bar(target.address, True) == 2
assert caller.bar(target.address, False) == 2
+ assert caller.baz(target.address, True) == 3
+ assert caller.baz(target.address, False) == 3
uncompilable_code = [
diff --git a/vyper/builtins/functions.py b/vyper/builtins/functions.py
index f81fb20a..8d39c3b0 100644
--- a/vyper/builtins/functions.py
+++ b/vyper/builtins/functions.py
@@ -1188,7 +1188,9 @@ class RawCall(BuiltinFunction):
if revert_on_failure:
typ = bytes_ty
+ # check the call success flag, and store returndata in memory
ret_ir = ["seq", check_external_call(call_ir), store_output_size]
+ return IRnode.from_list(ret_ir, typ=typ, location=MEMORY)
else:
typ = TupleT([bool_ty, bytes_ty])
ret_ir = [
@@ -1198,16 +1200,22 @@ class RawCall(BuiltinFunction):
IRnode.from_list(call_ir, typ=bool_ty),
IRnode.from_list(store_output_size, typ=bytes_ty, location=MEMORY),
]
+ # return an IR tuple of call success flag and returndata pointer
+ return IRnode.from_list(ret_ir, typ=typ)
+
+ # max_outsize is 0.
+
+ if not revert_on_failure:
+ # return call flag as stack item
+ typ = bool_ty
+ return IRnode.from_list(call_ir, typ=typ)
else:
- if revert_on_failure:
- typ = None
- ret_ir = check_external_call(call_ir)
- else:
- typ = bool_ty
- ret_ir = call_ir
+ # check the call success flag and don't return anything
+ ret_ir = check_external_call(call_ir)
+ return IRnode.from_list(ret_ir, typ=None)
- return IRnode.from_list(ret_ir, typ=typ, location=MEMORY)
+ raise CompilerPanic("unreachable!")
class Send(BuiltinFunction):
|