Provide unique name from closures with same name#488
Open
Conversation
In YUL it's possible to declare closure with a same name, but in different scope, which previously resulted to func name conflict during LLVM IR construction. To solve this, track YUL scope when building LLVM IR and a special counter that increments every time function with the same name exists in LLVM module. There's still assert if somehow within the same scope there 2 functions with the same name, which should be forbidden by Yul Fixes: #474
elle-j
reviewed
Mar 6, 2026
Comment on lines
+88
to
+91
| /// Monotonic counter for unique frontend function name mangling. | ||
| function_counter: usize, | ||
| /// Scope stack mapping Yul names to mangled LLVM names. | ||
| function_scope: Vec<BTreeMap<String, String>>, |
Contributor
There was a problem hiding this comment.
Nit: What do you think about prefixing with frontend_ for more clarity?
| } | ||
| let counter = self.function_counter; | ||
| self.function_counter += 1; | ||
| let mangled = format!("{name}_{}__{counter}", self.code_type().unwrap()); |
Contributor
There was a problem hiding this comment.
Is the double _ intentional here?
Suggested change
| let mangled = format!("{name}_{}__{counter}", self.code_type().unwrap()); | |
| let mangled = format!("{name}_{}_{counter}", self.code_type().unwrap()); |
Comment on lines
+467
to
+472
| if let Some(scope) = self.function_scope.last() { | ||
| assert!( | ||
| !scope.contains_key(name), | ||
| "ICE: function '{name}' declared subsequently in the same scope" | ||
| ); | ||
| } |
Contributor
There was a problem hiding this comment.
I believe we should always expect the function scope to have been pushed, otherwise it's an internal error (currently the mangled name would otherwise silently not be inserted). (The last_mut() can be used here to replace the later self.function_scope.last_mut() as well 👍 )
Suggested change
| if let Some(scope) = self.function_scope.last() { | |
| assert!( | |
| !scope.contains_key(name), | |
| "ICE: function '{name}' declared subsequently in the same scope" | |
| ); | |
| } | |
| let scope = self | |
| .function_scope | |
| .last_mut() | |
| .expect("ICE: function scope must be pushed before declaring frontend functions"); | |
| assert!( | |
| !scope.contains_key(name), | |
| "ICE: function '{name}' declared subsequently in the same scope" | |
| ); |
|
|
||
| /// Pops the current function scope. | ||
| pub fn pop_function_scope(&mut self) { | ||
| self.function_scope.pop(); |
Contributor
There was a problem hiding this comment.
We could indicate an internal error here.
Suggested change
| self.function_scope.pop(); | |
| self.function_scope | |
| .pop() | |
| .expect("ICE: tried to pop an empty function scope stack"); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
In YUL it's possible to declare closure with a same name, but in different scope, which previously resulted to func name conflict during LLVM IR construction.
To solve this, track YUL scope when building LLVM IR and a special counter that increments every time function with the same name exists in LLVM module.
There's still assert if somehow within the same scope there 2 functions with the same name, which should be forbidden by Yul
Fixes: #474