Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] Add const qualifier in FnSig (for const fn pointers) #74553

Closed
wants to merge 15 commits into from
Closed

[WIP] Add const qualifier in FnSig (for const fn pointers) #74553

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
008daf0
Add constness qualifier to fn pointer
filtsin Jul 19, 2020
855eca0
Add constness qualifier to function signature
filtsin Jul 19, 2020
05f4924
Allow call const function pointer in const methods
filtsin Jul 19, 2020
97d388a
Add feature for const pointers
filtsin Jul 20, 2020
7374ae7
x.py fmt
filtsin Jul 20, 2020
4d9b253
Fix coerce-unify test
filtsin Jul 20, 2020
80ef1af
Add NotConstPointerCast + for unsafe. Add new tests for const fn ptr.…
filtsin Jul 21, 2020
d72e63b
Check const_fn_pointer feature in mir context
filtsin Jul 28, 2020
270bf4c
Add example of reifyfnpointer with const drop
filtsin Jul 30, 2020
d982864
Resolve conflict...
filtsin Oct 12, 2020
bb4ab24
Match coercion
filtsin Oct 12, 2020
55add43
Modified apply_adjustments, add unsafety coercion
filtsin Oct 13, 2020
ed42405
Fix typo
filtsin Oct 13, 2020
be46b44
Add coercion unsafe
filtsin Oct 13, 2020
c772728
Resolve conflict
filtsin Oct 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add coercion unsafe
  • Loading branch information
@filtsin
filtsin committed Oct 14, 2020
commit be46b44283c1936e4cbdc1dd1c346116af4e3c98
8 changes: 4 additions & 4 deletions compiler/rustc_typeck/src/check/coercion.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,10 +994,10 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
new_sig = self.tcx.signature_not_const_fn(prev_sig);
new_drop_const = true;
}
if prev_sig.unsafety() != new_sig.unsafety() {
prev_sig = prev_sig.map_bound(|sig| ty::FnSig { unsafety: hir::Unsafety::Unsafe, ..sig });
new_sig = new_sig.map_bound(|sig| ty::FnSig { unsafety: hir::Unsafety::Unsafe, ..sig });
}
}
if prev_sig.unsafety() != new_sig.unsafety() {
prev_sig = prev_sig.map_bound(|sig| ty::FnSig { unsafety: hir::Unsafety::Unsafe, ..sig });
new_sig = new_sig.map_bound(|sig| ty::FnSig { unsafety: hir::Unsafety::Unsafe, ..sig });
Comment on lines +998 to +1000
Copy link
Author

@filtsin filtsin Oct 13, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this code that compiles on stable:

const fn foo() { }
const fn bar() { }
fn baz() { }


fn main() {
    let x: unsafe fn() = match 2 {
        2 => bar,
        3 => foo,
        _ => baz
    };

}

This code compiles with these changes:

const unsafe fn foo() { }
const fn bar() { }
fn baz() { }


fn main() {
    let x = match 2 {
        2 => bar,
        3 => foo,
        _ => baz
    };

}

but not in stable

}
(Some(prev_sig), Some(new_sig))
}
Expand Down