Fix the helper

src/coreclr/jit/compiler.h

@@ -4069,7 +4069,7 @@ class Compiler
                           unsigned             curLevel,
                           Statement** pAfterStmt DEBUGARG(const char* reason));
 
-    CORINFO_CLASS_HANDLE impImportHandleFromTree(GenTree* tree, bool allowShared);
+    CORINFO_CLASS_HANDLE impImportHandleFromStack(bool allowShared);
 
     GenTree* impStoreStruct(GenTree*         store,
                              unsigned         curLevel,

src/coreclr/jit/importer.cpp

@@ -2040,18 +2040,18 @@ GenTree* Compiler::impCloneExpr(GenTree*    tree,
 }
 
 //------------------------------------------------------------------------
-// impImportHandleFromTree: Imports a tree that's only used for obtaining a type handle
-// to its value
+// impImportHandleFromTree: Imports the tree on the top of the stack
+//    and extracts the handle from it
 //
 // Arguments:
-//    tree        - imported tree
 //    allowShared - whether shared types are considered as valid handles
 //
 // Return Value:
 //    The extracted handle, or NO_CLASS_HANDLE if no handle could be extracted
 //
-CORINFO_CLASS_HANDLE Compiler::impImportHandleFromTree(GenTree* tree, bool allowShared)
+CORINFO_CLASS_HANDLE Compiler::impImportHandleFromStack(bool allowShared)
 {
+    GenTree*             tree    = impStackTop().val;
     bool                 isExact = false;
     bool                 notNull = false;
     CORINFO_CLASS_HANDLE typeHnd = gtGetClassHandle(tree, &isExact, &notNull);
@@ -2064,6 +2064,7 @@ CORINFO_CLASS_HANDLE Compiler::impImportHandleFromTree(GenTree* tree, bool allow
         }
 
         JITDUMP("Retuning a constant handle from imported tree\n");
+        impPopStack();
         if (!notNull && fgAddrCouldBeNull(tree))
         {
             impAppendTree(gtNewNullCheck(tree, compCurBB), CHECK_SPILL_ALL, impCurStmtDI);

src/coreclr/jit/importercalls.cpp

@@ -3564,11 +3564,10 @@ GenTree* Compiler::impIntrinsic(GenTree*                newobjThis,
                 // Load handle directly for known types
                 if (retNode == nullptr)
                 {
-                    CORINFO_CLASS_HANDLE typeHnd = impImportHandleFromTree(op1, false);
+                    CORINFO_CLASS_HANDLE typeHnd = impImportHandleFromStack(false);
                     if (typeHnd != NO_CLASS_HANDLE)
                     {
                         JITDUMP("Optimizing object.GetType() with known type to typeof\n");
-                        impPopStack();
                         GenTree* handle = gtNewIconEmbClsHndNode(typeHnd);
                         retNode         = gtNewHelperCallNode(CORINFO_HELP_TYPEHANDLE_TO_RUNTIMETYPE, TYP_REF, handle);
                     }