-
Notifications
You must be signed in to change notification settings - Fork 12.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix ICE on const of nullable enum with fields in null case.
That is, if you have an enum type that is subject to the nullable pointer optimization, but the null variant has a nonzero number of fields, and you declare a static whose value is of that variant, then that used to be an ICE but this change fixes it.
- Loading branch information
Showing
2 changed files
with
19 additions
and
1 deletion.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
// 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. | ||
|
||
use std::result::{Result,Ok}; | ||
static C: Result<(), ~int> = Ok(()); | ||
|
||
// This is because of yet another bad assertion (ICE) about the null side of a nullable enum. | ||
// So we won't actually compile if the bug is present, but we check the value in main anyway. | ||
|
||
pub fn main() { | ||
assert!(C.is_ok()); | ||
} |
5487f15
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 alexcrichton
at jld@5487f15
5487f15
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 jld/rust/enum-nullable-const-null-with-fields = 5487f15 into auto
5487f15
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.
jld/rust/enum-nullable-const-null-with-fields = 5487f15 merged ok, testing candidate = 423dd84
5487f15
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/3484
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-c/builds/1326
success: http://buildbot.rust-lang.org/builders/auto-mac-32-nopt-t/builds/1330
success: http://buildbot.rust-lang.org/builders/auto-mac-64-opt/builds/3486
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-c/builds/2587
success: http://buildbot.rust-lang.org/builders/auto-mac-64-nopt-t/builds/2592
success: http://buildbot.rust-lang.org/builders/auto-linux-32-opt/builds/3502
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-c/builds/2590
success: http://buildbot.rust-lang.org/builders/auto-linux-32-nopt-t/builds/2596
success: http://buildbot.rust-lang.org/builders/auto-linux-64-opt/builds/3504
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-c/builds/2590
success: http://buildbot.rust-lang.org/builders/auto-linux-64-nopt-t/builds/2595
success: http://buildbot.rust-lang.org/builders/auto-linux-64-x-android/builds/2664
success: http://buildbot.rust-lang.org/builders/auto-win-32-opt/builds/3492
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-c/builds/2594
success: http://buildbot.rust-lang.org/builders/auto-win-32-nopt-t/builds/2598
success: http://buildbot.rust-lang.org/builders/auto-bsd-64-opt/builds/3265
5487f15
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 = 423dd84