A bunch of lexer changes #14630
Closed
A bunch of lexer changes #14630
Conversation
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
|
(There is no change in behavior here) |
| @@ -546,8 +546,7 @@ pub fn trans_rust_fn_with_foreign_abi(ccx: &CrateContext, | |||
| let t = ty::node_id_to_type(tcx, id); | |||
|
|
|||
| let ps = ccx.tcx.map.with_path(id, |path| { | |||
| let abi = Some(ast_map::PathName(special_idents::clownshoe_abi.name)); | |||
| link::mangle(path.chain(abi.move_iter()), None, None) | |||
| link::mangle(path, None, None) | |||
There was a problem hiding this comment.
I think this may still be necessary (for now). For example, this is the output of pub extern fn foo() {}
target datalayout = "e-i64:64-f80:128-n8:16:32:64"
target triple = "x86_64-apple-darwin"
define void @_ZN3foo20h2f9dbd5552bebf99daa4v0.0E() unnamed_addr #0 {
"the block":
call void @_ZN3foo10__rust_abiE()
ret void
}
; Function Attrs: uwtable
define internal void @_ZN3foo10__rust_abiE() unnamed_addr #1 {
entry-block:
ret void
}
attributes #0 = { "split-stack" }
attributes #1 = { uwtable "split-stack" }
You'll notice that the name of the wrapper is _ZN3foo10__rust_abiE, and if we remove the clownshoe abi the name would be _ZN3fooE. I believe that this would clash with any C++ function named foo.
Until this is fixed, I don't think that we should remove the clownshoe abi (or at least not the symbol associated with it). Others may be more familiar with why this is here than I.
There was a problem hiding this comment.
Ok, I wasn't sure about it. At the very least we don't need to include it in tokens, we can just add the string right here, yes?
bors
added a commit
that referenced
this pull request
Jun 4, 2014
These are a pain to rebase, so I'm separating this from the rest of my work. Nothing controversial here, just some simple refactoring and removal of an unused entry in the token table. Brings the lexer into 2012 with methods!
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 5, 2023
internal: `Arc<String>` -> `Arc<str>`
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
These are a pain to rebase, so I'm separating this from the rest of my work.
Nothing controversial here, just some simple refactoring and removal of an
unused entry in the token table. Brings the lexer into 2012 with methods!