Revert "Implementing basic nameof and typenameof operators"

This reverts commit 223d313.

Conflicts:
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAdditionExpr.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAppliedFunction.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfAsAFunction.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfDictLookup.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfIntConst.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfIntegerAppliedFunction.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfParameterAppliedFunction.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfPartiallyAppliedFunction.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfStringConst.fs
	tests/fsharpqa/Source/Conformance/Expressions/DataExpressions/NameOf/E_NameOfWithPipe.fs

src/fsharp/FSharp.Core/prim-types.fs

@@ -4748,12 +4748,6 @@ namespace Microsoft.FSharp.Core
         [<CompiledName("TypeOf")>]
         let inline typeof<'T> = BasicInlinedOperations.typeof<'T>
 
-        [<CompiledName("TypeNameOf")>]
-        let inline typenameof<'T> : string = raise (Exception "may not call directly, should always be optimized away")
-
-        [<CompiledName("NameOf")>]
-        let inline nameof (_: 'T) : string = raise (Exception "may not call directly, should always be optimized away")
-
         [<CompiledName("MethodHandleOf")>]
         let methodhandleof (_call: ('T -> 'TResult)) : System.RuntimeMethodHandle = raise (Exception "may not call directly, should always be optimized away")
 

src/fsharp/FSharp.Core/prim-types.fsi

@@ -2320,15 +2320,6 @@ namespace Microsoft.FSharp.Core
         [<CompiledName("TypeOf")>]
         val inline typeof<'T> : System.Type
 
-        /// <summary>Returns the name of the given static type.</summary> 
-        [<RequiresExplicitTypeArguments>] 
-        [<CompiledName("TypeNameOf")>]
-        val inline typenameof<'T> : string
-
-        /// <summary>Returns the name of the given symbol.</summary>        
-        [<CompiledName("NameOf")>]
-        val inline nameof : 'T -> string
-
         /// <summary>An internal, library-only compiler intrinsic for compile-time 
         /// generation of a RuntimeMethodHandle.</summary>
         [<CompiledName("MethodHandleOf")>]

src/fsharp/Optimizer.fs

@@ -1185,7 +1185,7 @@ let AbstractAndRemapModulInfo msg g m (repackage,hidden) info =
     info
 
 //-------------------------------------------------------------------------
-// Misc helpers
+// Misc helerps
 //------------------------------------------------------------------------- 
 
 // Mark some variables (the ones we introduce via abstractBigTargets) as don't-eliminate 
@@ -2501,37 +2501,6 @@ and TryDevirtualizeApplication cenv env (f,tyargs,args,m) =
                 MightMakeCriticalTailcall = false
                 Info=UnknownValue})
 
-    // Analyze the name of the given symbol and rewrite AST to constant string expression with the name
-    | Expr.Val(vref,_,_),_,_ when valRefEq cenv.g vref cenv.g.nameof_vref ->
-        PostTypeCheckSemanticChecks.tryExtractNameOf args
-        |> Option.map (fun name ->
-            Expr.Const(Const.String name, m, cenv.g.string_ty),
-                { TotalSize = 1
-                  FunctionSize = 1
-                  HasEffect = false
-                  MightMakeCriticalTailcall = false
-                  Info = UnknownValue })
-    // Analyze the name of the given type and rewrite AST to constant string expression with the name
-    | Expr.Val(vref,_,_),_,_ when valRefEq cenv.g vref cenv.g.typenameof_vref ->
-        match tyargs with
-        | (typeName:TType):: _ ->
-            let name =
-                match typeName with 
-                | TType_forall (_tps,ty) -> ty.ToString()
-                | TType_app (tcref, _) -> tcref.CompiledRepresentationForNamedType.FullName
-                | TType_tuple tinst -> "(" + String.concat "," (List.map string tinst) + ")"
-                | TType_fun (d,r) -> "(" + string d + " -> " + string r + ")"
-                | TType_ucase (uc,_) ->  uc.CaseName
-                | TType_var tp -> tp.DisplayName
-                | TType_measure ms -> sprintf "%A" ms
-
-            Some(Expr.Const(Const.String name, m, cenv.g.string_ty),
-                    { TotalSize = 1
-                      FunctionSize = 1
-                      HasEffect = false
-                      MightMakeCriticalTailcall = false
-                      Info = UnknownValue })
-        | _ -> None
     | _ -> None
 
 /// Attempt to inline an application of a known value at callsites

src/fsharp/PostInferenceChecks.fs

@@ -507,27 +507,6 @@ let CheckMultipleInterfaceInstantiations cenv interfaces m =
 let rec CheckExprNoByrefs (cenv:cenv) (env:env) expr =
     CheckExpr cenv env expr NoByrefs
 
-// tries to extract the name of an expression
-let tryExtractNameOf args =
-    match args with
-    | [Expr.App(Expr.Val(r,_,_),_,_,Expr.Const(constant,_,_)::_,_)] -> 
-        if r.CompiledName.StartsWith("get_") && constant = Const.Unit then // TODO: We need a better way to find static property getters
-            Some(r.CompiledName.Substring(4))
-        else
-            None  // the function was applied
-    | [Expr.App(Expr.Val(r,_,_),_,_,[],_)] -> Some(r.CompiledName)
-    | [Expr.App(Expr.Val(r,_,_),_,_,_,_)] ->
-        if r.CompiledName.StartsWith("get_") then // TODO: We need a better way to find member property getters
-            Some(r.CompiledName.Substring(4))
-        else
-            None  // the function was applied
-    | [Expr.Let(_,Expr.Val(r,_,_),_,_)] -> Some(r.CompiledName)
-    | [Expr.Let(_,Expr.Lambda(_,_,_,_,Expr.App(Expr.Val(r,_,_),_,_,_,_),_,_),_,_)] -> Some(r.CompiledName)
-    | [Expr.Lambda(_,_,_,_,Expr.App(Expr.Val(r,_,_),_,_,_,_),_,_)] -> Some(r.CompiledName)
-    | [Expr.Op(TOp.ValFieldGet(r),_,_,_)] -> Some(r.FieldName)
-    | [Expr.Lambda(_,_,_,_,Expr.Op(TOp.ILCall(_,_,_,_,_,_,_,r,_,_,_),_,_,_),_,_)] -> Some(r.Name)
-    | _ -> None
-
 /// Check a value
 and CheckVal (cenv:cenv) (env:env) v m context = 
     if cenv.reportErrors then 
@@ -557,18 +536,8 @@ and CheckExpr (cenv:cenv) (env:env) expr (context:ByrefContext) =
         CheckExpr cenv env body context
 
     | Expr.Const (_,m,ty) -> 
-        CheckTypePermitByrefs cenv env m ty
-
-    | Expr.App(Expr.Val (v,_,_),_,_,args,m) -> 
-        if cenv.reportErrors then
-            if valRefEq cenv.g v cenv.g.nameof_vref && tryExtractNameOf args = None then
-                errorR(Error(FSComp.SR.expressionHasNoName(), m))
-            match args with
-            | [_;Expr.App(Expr.Val (v,_,_),_,_,args,m)] ->
-                if valRefEq cenv.g v cenv.g.nameof_vref && tryExtractNameOf args = None then
-                    errorR(Error(FSComp.SR.nameofNotPermitted(), m))
-            | _ -> ()
-
+        CheckTypePermitByrefs cenv env m ty 
+
     | Expr.Val (v,vFlags,m) -> 
           if cenv.reportErrors then 
               if v.BaseOrThisInfo = BaseVal then 

src/fsharp/PostInferenceChecks.fsi

@@ -10,4 +10,3 @@ open Microsoft.FSharp.Compiler.InfoReader
 
 val testFlagMemberBody : bool ref
 val CheckTopImpl : TcGlobals * Import.ImportMap * bool * InfoReader * Tast.CompilationPath list * Tast.CcuThunk * Tastops.DisplayEnv * Tast.ModuleOrNamespaceExprWithSig * Tast.Attribs * (bool * bool) -> bool
-val tryExtractNameOf : Microsoft.FSharp.Compiler.Tast.Expr list -> string option

src/fsharp/TastOps.fs

@@ -2879,11 +2879,6 @@ let isTypeOfValRef g vref =
     // There is an internal version of typeof defined in prim-types.fs that needs to be detected
     || (g.compilingFslib && vref.LogicalName = "typeof") 
 
-let isTypeNameOfValRef g vref = 
-    valRefEq g vref g.typenameof_vref 
-    // There is an internal version of typenameof defined in prim-types.fs that needs to be detected
-    || (g.compilingFslib && vref.LogicalName = "typenameof") 
-
 let isSizeOfValRef g vref = 
     valRefEq g vref g.sizeof_vref 
     // There is an internal version of typeof defined in prim-types.fs that needs to be detected
@@ -2904,11 +2899,6 @@ let (|TypeOfExpr|_|) g expr =
     | Expr.App(Expr.Val(vref,_,_),_,[ty],[],_) when isTypeOfValRef g vref ->  Some ty
     | _ -> None
 
-let (|TypeNameOfExpr|_|) g expr = 
-    match expr with 
-    | Expr.App(Expr.Val(vref,_,_),_,[ty],[],_) when isTypeNameOfValRef g vref  -> Some ty
-    | _ -> None
-
 let (|SizeOfExpr|_|) g expr = 
     match expr with 
     | Expr.App(Expr.Val(vref,_,_),_,[ty],[],_) when isSizeOfValRef g vref ->  Some ty
@@ -6089,7 +6079,6 @@ let mkCallUnboxFast            (g:TcGlobals) m ty e1    = mkApps g (typedExprFor
 let mkCallTypeTest             (g:TcGlobals) m ty e1    = mkApps g (typedExprForIntrinsic g m g.istype_info,      [[ty]], [ e1 ],  m)
 let mkCallTypeOf               (g:TcGlobals) m ty       = mkApps g (typedExprForIntrinsic g m g.typeof_info,      [[ty]], [ ],  m)
 let mkCallTypeDefOf            (g:TcGlobals) m ty       = mkApps g (typedExprForIntrinsic g m g.typedefof_info,   [[ty]], [ ],  m)
-let mkCallTypeNameOf           g m ty       = mkApps g (typedExprForIntrinsic g m g.typenameof_info,  [[ty]], [ ],  m)
 
 
 let mkCallDispose              (g:TcGlobals) m ty e1         = mkApps g (typedExprForIntrinsic g m g.dispose_info,                  [[ty]], [ e1 ],  m)
@@ -7751,7 +7740,6 @@ let IsSimpleSyntacticConstantExpr g inputExpr =
         | Expr.Op (TOp.UnionCase _,_,[],_)         // Nullary union cases
         | UncheckedDefaultOfExpr g _ 
         | SizeOfExpr g _ 
-        | TypeNameOfExpr g _ 
         | TypeOfExpr g _ -> true
         // All others are not simple constant expressions
         | _ -> false

src/fsharp/TastOps.fsi

@@ -1179,7 +1179,6 @@ val mkCallTypeTest      : TcGlobals -> range -> TType -> Expr -> Expr
 val canUseTypeTestFast : TcGlobals -> TType -> bool
 
 val mkCallTypeOf      : TcGlobals -> range -> TType -> Expr
-val mkCallTypeNameOf  : TcGlobals -> range -> TType -> Expr
 val mkCallTypeDefOf   : TcGlobals -> range -> TType -> Expr 
 
 val mkCallCreateInstance     : TcGlobals -> range -> TType -> Expr

src/fsharp/TcGlobals.fs

@@ -162,10 +162,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
                       // The helper to find system types amongst referenced DLLs
                       tryFindSysTypeCcu, 
                       emitDebugInfoInQuotations: bool, usesMscorlib: bool, noDebugData: bool) =
-      nameof_info               : IntrinsicValRef
-      nameof_vref               : ValRef
-      typenameof_info           : IntrinsicValRef
-      typenameof_vref           : ValRef
 
   let vara = NewRigidTypar "a" envRange
   let varb = NewRigidTypar "b" envRange
@@ -573,8 +569,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
   let v_typeof_info                = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "typeof"                               , None                 , Some "TypeOf" , [vara],     ([], v_system_Type_typ))  
   let v_methodhandleof_info        = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "methodhandleof"                       , None                 , Some "MethodHandleOf", [vara;varb], ([[varaTy --> varbTy]], v_system_RuntimeMethodHandle_typ))
   let v_sizeof_info                = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "sizeof"                               , None                 , Some "SizeOf" , [vara],     ([], v_int_ty))  
-  let typenameof_info            = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "typenameof"                           ,None                 ,Some "TypeNameOf" ,[vara],     ([],string_ty))
-  let nameof_info                = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "nameof"                               ,None                 ,Some "NameOf" ,[vara],     ([[varaTy]],string_ty))
   let v_unchecked_defaultof_info   = makeIntrinsicValRef(fslib_MFOperatorsUnchecked_nleref,                    "defaultof"                            , None                 , Some "DefaultOf", [vara],     ([], varaTy))  
   let v_typedefof_info             = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "typedefof"                            , None                 , Some "TypeDefOf", [vara],     ([], v_system_Type_typ))  
   let v_enum_info                  = makeIntrinsicValRef(fslib_MFOperators_nleref,                             "enum"                                 , None                 , Some "ToEnum" , [vara],     ([[v_int_ty]], varaTy))  
@@ -916,10 +910,6 @@ type public TcGlobals(compilingFslib: bool, ilg:ILGlobals, fslibCcu: CcuThunk, d
   member val system_MarshalByRefObject_typ = tryMkSysNonGenericTy sys "MarshalByRefObject"
 
   member __.system_Reflection_MethodInfo_typ = v_system_Reflection_MethodInfo_typ
-    nameof_info                = nameof_info
-    nameof_vref                = ValRefForIntrinsic nameof_info
-    typenameof_info            = typenameof_info
-    typenameof_vref            = ValRefForIntrinsic typenameof_info
 
   member val system_Array_tcref  = findSysTyconRef sys "Array"
   member val system_Object_tcref  = findSysTyconRef sys "Object"