Resolve conflict...

Author: filtsin

compiler/rustc_codegen_ssa/src/mir/rvalue.rs

@@ -186,7 +186,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
                 let val = match *kind {
                     mir::CastKind::Pointer(
                         PointerCast::ReifyFnPointer | PointerCast::ReifyNotConstFnPointer,
-                    ) => match operand.layout.ty.kind() {
+                    ) => match *operand.layout.ty.kind() {
                         ty::FnDef(def_id, substs) => {
                             if bx.cx().tcx().has_attr(def_id, sym::rustc_args_required_const) {
                                 bug!("reifying a fn ptr that requires const arguments");

compiler/rustc_mir/src/interpret/cast.rs

@@ -87,7 +87,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
             Pointer(PointerCast::NotConstFnPointer) => {
                 let src = self.read_immediate(src)?;
-                match cast_ty.kind {
+                match cast_ty.kind() {
                     ty::FnPtr(_) => {
                         // No change to value
                         self.write_immediate(*src, dest)?;
@@ -98,7 +98,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
 
             Pointer(PointerCast::UnsafeNotConstFnPointer) => {
                 let src = self.read_immediate(src)?;
-                match cast_ty.kind {
+                match cast_ty.kind() {
                     ty::FnPtr(_) => {
                         // No change to value
                         self.write_immediate(*src, dest)?;

compiler/rustc_mir/src/transform/check_consts/validation.rs

@@ -557,6 +557,9 @@ impl Visitor<'tcx> for Validator<'mir, 'tcx> {
                 CastKind::Pointer(
                     PointerCast::UnsafeFnPointer
                     | PointerCast::ClosureFnPointer(_)
+                    | PointerCast::ReifyNotConstFnPointer
+                    | PointerCast::NotConstFnPointer
+                    | PointerCast::UnsafeNotConstFnPointer
                     | PointerCast::ReifyFnPointer,
                 ),
                 _,

compiler/rustc_typeck/src/check/check.rs

@@ -85,6 +85,7 @@ pub(super) fn check_fn<'a, 'tcx>(
         fn_sig.c_variadic,
         fn_sig.unsafety,
         fn_sig.abi,
+        fn_sig.constness,
     );
 
     let span = body.value.span;

compiler/rustc_typeck/src/check/mod.rs

@@ -498,6 +498,7 @@ fn typeck_with_fallback<'tcx>(
                     &fcx,
                     header.unsafety,
                     header.abi,
+                    header.constness,
                     decl,
                     &hir::Generics::empty(),
                     None,