-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
rustc: use Name numbers rather than the Show impl for constants.
Using the Show impl for Names created global symbols with names like `"str\"str\"(1027)"`. This adjusts strings, binaries and vtables to avoid using that impl. Fixes #15799.
- Loading branch information
Showing
4 changed files
with
38 additions
and
3 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
-include ../tools.mk | ||
|
||
# check that the compile generated symbols for strings, binaries, | ||
# vtables, etc. have semisane names (e.g. `str1234`); it's relatively | ||
# easy to accidentally modify the compiler internals to make them | ||
# become things like `str"str"(1234)`. | ||
|
||
OUT=$(TMPDIR)/lib.s | ||
|
||
all: | ||
$(RUSTC) lib.rs --emit=asm --crate-type=staticlib | ||
# just check for symbol declarations with the names we're expecting. | ||
grep 'str[0-9]\+:' $(OUT) | ||
grep 'binary[0-9]\+:' $(OUT) | ||
grep 'vtable[0-9]\+' $(OUT) |
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT | ||
// file at the top-level directory of this distribution and at | ||
// http://rust-lang.org/COPYRIGHT. | ||
// | ||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or | ||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license | ||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your | ||
// option. This file may not be copied, modified, or distributed | ||
// except according to those terms. | ||
|
||
pub static X: &'static str = "foobarbaz"; | ||
pub static Y: &'static [u8] = include_bin!("lib.rs"); | ||
|
||
trait Foo {} | ||
impl Foo for uint {} | ||
|
||
pub fn dummy() { | ||
// force the vtable to be created | ||
let _x = &1u as &Foo; | ||
} |
e753dbb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
saw approval from pnkfelix
at huonw@e753dbb
e753dbb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
merging huonw/rust/more-token-numbers = e753dbb into auto
e753dbb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
huonw/rust/more-token-numbers = e753dbb merged ok, testing candidate = 795f6ae
e753dbb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
all tests pass:
success: http://buildbot.rust-lang.org/builders/auto-mac-32-opt/builds/674
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/674
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/673
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/674
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/671
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/672
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/671
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/677
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/672
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/671
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android-t/builds/674
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/672
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/672
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/673
e753dbb
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fast-forwarding master to auto = 795f6ae