fix[lang]: show user error in error map

tests/unit/compiler/test_source_map.py

@@ -97,8 +97,33 @@ def update_foo():
  self.foo += 1
  """
  error_map = compile_code(code, output_formats=["source_map"])["source_map"]["error_map"]
- assert "safeadd" in list(error_map.values())
- assert "fallback function" in list(error_map.values())
+ assert "safeadd" in error_map.values()
+ assert "fallback function" in error_map.values()
+
+
+def test_error_map_with_user_error():
+ code = """
+@external
+def foo():
+ raise "some error"
+ """
+ error_map = compile_code(code, output_formats=["source_map"])["source_map"]["error_map"]
+ assert "user revert with reason" in error_map.values()
+
+
+def test_error_map_not_overriding_errors():
+ code = """
+@external
+def foo(i: uint256):
+ raise self.bar(5%i)
+
+@pure
+def bar(i: uint256) -> String[32]:
+ return "foo foo"
+ """
+ error_map = compile_code(code, output_formats=["source_map"])["source_map"]["error_map"]
+ assert "user revert with reason" in error_map.values()
+ assert "safemod" in error_map.values()
 
 
 def test_compress_source_map():

vyper/codegen/ir_node.py

@@ -382,6 +382,8 @@ def is_complex_ir(self):
  # useful for overriding an error message generated by a helper
  # function with a more specific error message.
  def set_error_msg(self, error_msg: str) -> None:
+ if self.error_msg is not None:
+ return
  self.error_msg = error_msg
  for arg in self.args:
  arg.set_error_msg(error_msg)

vyper/codegen/stmt.py

@@ -155,7 +155,10 @@ def _assert_reason(self, test_expr, msg):
  ir_node = revert_seq
  else:
  ir_node = ["if", ["iszero", test_expr], revert_seq]
- return IRnode.from_list(ir_node, error_msg="user revert with reason")
+
+ ir_node = IRnode.from_list(ir_node)
+ ir_node.set_error_msg("user revert with reason")
+ return ir_node
 
  def parse_Assert(self):
  test_expr = Expr.parse_value_expr(self.stmt.test, self.context)