Report -1 for GC.GetGeneration(nongc_obj) and same for GetObjectGeneration

src/coreclr/gc/gc.cpp

@@ -45893,9 +45893,10 @@ unsigned int GCHeap::WhichGeneration (Object* object)
 {
     uint8_t* o = (uint8_t*)object;
 #ifdef FEATURE_BASICFREEZE
-    if (!((o < g_gc_highest_address) && (o >= g_gc_lowest_address)))
+    if (GCHeap::IsInFrozenSegment (object))
     {
-        return max_generation;
+        // Report -1 for objects allocated on NonGC heaps (aka frozen segments)
+        return -1;
     }
 #endif //FEATURE_BASICFREEZE
     gc_heap* hp = gc_heap::heap_of (o);

src/coreclr/gc/gcinterface.h

@@ -984,7 +984,7 @@ void updateGCShadow(Object** ptr, Object* val);
 #define GC_CALL_INTERIOR            0x1
 #define GC_CALL_PINNED              0x2
 
-// keep in sync with GC_ALLOC_FLAGS in GC.cs
+// keep in sync with GC_ALLOC_FLAGS in GC.CoreCLR.cs
 enum GC_ALLOC_FLAGS
 {
     GC_ALLOC_NO_FLAGS           = 0,

src/coreclr/inc/corerror.xml

@@ -1182,6 +1182,11 @@
     <Comment> The runtime cannot be suspened since a suspension is already in progress. </Comment>
 </HRESULT>
 
+<HRESULT NumericValue="0x80131389">
+    <SymbolicName>CORPROF_E_NOT_GC_OBJECT</SymbolicName>
+    <Comment> This object belongs to a non-gc heap. </Comment>
+</HRESULT>
+
 <HRESULT NumericValue="0x80131416">
 	<SymbolicName>CORSEC_E_POLICY_EXCEPTION</SymbolicName>
 	<Message>"PolicyException thrown."</Message>

src/coreclr/pal/prebuilt/corerror/mscorurt.rc

@@ -18,7 +18,7 @@ BEGIN
 	MSG_FOR_URT_HR(FUSION_E_INVALID_NAME) "The given assembly name was invalid."
 	MSG_FOR_URT_HR(FUSION_E_CACHEFILE_FAILED) "Failed to add file to AppDomain cache."
 	MSG_FOR_URT_HR(FUSION_E_APP_DOMAIN_LOCKED) "The requested assembly version conflicts with what is already bound in the app domain or specified in the manifest."
-	MSG_FOR_URT_HR(COR_E_LOADING_REFERENCE_ASSEMBLY) "Reference assemblies cannot be loaded for execution."
+	MSG_FOR_URT_HR(COR_E_LOADING_REFERENCE_ASSEMBLY) "Reference assemblies cannot not be loaded for execution."
 	MSG_FOR_URT_HR(COR_E_AMBIGUOUSIMPLEMENTATION) "Ambiguous implementation found."
 	MSG_FOR_URT_HR(CLDB_E_FILE_BADREAD) "Error occurred during a read."
 	MSG_FOR_URT_HR(CLDB_E_FILE_BADWRITE) "Error occurred during a write."
@@ -245,7 +245,7 @@ BEGIN
 	MSG_FOR_URT_HR(CORDBG_E_CANNOT_RESOLVE_ASSEMBLY) "We failed to resolve assembly given an AssemblyRef token. Assembly may be not loaded yet or not a valid token."
 	MSG_FOR_URT_HR(CORDBG_E_MUST_BE_IN_LOAD_MODULE) "Must be in context of LoadModule callback to perform requested operation."
 	MSG_FOR_URT_HR(CORDBG_E_CANNOT_BE_ON_ATTACH) "Requested operation cannot be performed during an attach operation."
-	MSG_FOR_URT_HR(CORDBG_E_NGEN_NOT_SUPPORTED) "NGEN is not supported."
+	MSG_FOR_URT_HR(CORDBG_E_NGEN_NOT_SUPPORTED) "NGEN must be supported to perform the requested operation."
 	MSG_FOR_URT_HR(CORDBG_E_ILLEGAL_SHUTDOWN_ORDER) "Trying to shutdown out of order."
 	MSG_FOR_URT_HR(CORDBG_E_CANNOT_DEBUG_FIBER_PROCESS) "Debugging fiber mode managed process is not supported."
 	MSG_FOR_URT_HR(CORDBG_E_MUST_BE_IN_CREATE_PROCESS) "Must be in context of CreateProcess callback to perform requested operation."
@@ -288,6 +288,7 @@ BEGIN
 	MSG_FOR_URT_HR(CORDBG_E_MISSING_DEBUGGER_EXPORTS) "The debuggee memory space does not have the expected debugging export table."
 	MSG_FOR_URT_HR(CORDBG_E_DATA_TARGET_ERROR) "Failure when calling a data target method."
 	MSG_FOR_URT_HR(CORDBG_E_UNSUPPORTED_DELEGATE) "The delegate contains a delegate currently not supported by the API."
+	MSG_FOR_URT_HR(CORDBG_E_ASSEMBLY_UPDATES_APPLIED) "The operation is not supported because assembly updates have been applied."
 	MSG_FOR_URT_HR(PEFMT_E_64BIT) "File is PE32+."
 	MSG_FOR_URT_HR(PEFMT_E_32BIT) "File is PE32"
 	MSG_FOR_URT_HR(CLR_E_BIND_ASSEMBLY_VERSION_TOO_LOW) "The bound assembly has a version that is lower than that of the request."

src/coreclr/pal/prebuilt/inc/corerror.h

@@ -214,6 +214,7 @@
 #define CORDIAGIPC_E_UNKNOWN_MAGIC EMAKEHR(0x1386)
 #define CORDIAGIPC_E_UNKNOWN_ERROR EMAKEHR(0x1387)
 #define CORPROF_E_SUSPENSION_IN_PROGRESS EMAKEHR(0x1388)
+#define CORPROF_E_NOT_GC_OBJECT EMAKEHR(0x1389)
 #define CORSEC_E_POLICY_EXCEPTION EMAKEHR(0x1416)
 #define CORSEC_E_MIN_GRANT_FAIL EMAKEHR(0x1417)
 #define CORSEC_E_NO_EXEC_PERM EMAKEHR(0x1418)

src/coreclr/vm/proftoeeinterfaceimpl.cpp

@@ -9141,6 +9141,15 @@ HRESULT ProfToEEInterfaceImpl::GetObjectGeneration(ObjectID objectId,
 
     IGCHeap *hp = GCHeapUtilities::GetGCHeap();
 
+    if (hp->IsInFrozenSegment((Object*)objectId))
+    {
+        range->generation = (COR_PRF_GC_GENERATION)-1;
+        range->rangeStart = 0;
+        range->rangeLength = 0;
+        range->rangeLengthReserved = 0;
+        return CORPROF_E_NOT_GC_OBJECT;
+    }
+
     uint8_t* pStart;
     uint8_t* pAllocated;
     uint8_t* pReserved;

src/tests/profiler/gc/nongcheap.cs

@@ -0,0 +1,49 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace Profiler.Tests
+{
+    class NonGCHeapTests
+    {
+        static readonly Guid GcAllocateEventsProfilerGuid = new Guid("EF0D191C-3FC7-4311-88AF-E474CBEB2859");
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void AllocateNonGcHeapObjects()
+        {
+            // When this method is invoked, JIT is expected to trigger allocations for these
+            // string literals and they're expected to end up in a nongc segment (also known as frozen)
+            Consume("string1");
+            Consume("string2");
+            Consume("string3");
+            Consume("string4");
+            Consume("string5");
+            Consume("string6");
+        }
+
+        [MethodImpl(MethodImplOptions.NoInlining)]
+        static void Consume(object o) {}
+
+        public static int RunTest(String[] args) 
+        {
+            AllocateNonGcHeapObjects();
+            Console.WriteLine("Test Passed");
+            return 100;
+        }
+
+        public static int Main(string[] args)
+        {
+            if (args.Length > 0 && args[0].Equals("RunTest", StringComparison.OrdinalIgnoreCase))
+            {
+                return RunTest(args);
+            }
+
+            return ProfilerTestRunner.Run(profileePath: System.Reflection.Assembly.GetExecutingAssembly().Location,
+                                          testName: "NonGCHeapAllocate",
+                                          profilerClsid: GcAllocateEventsProfilerGuid);
+        }
+    }
+}

src/tests/profiler/gc/nongcheap.csproj

@@ -0,0 +1,21 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFrameworkIdentifier>.NETCoreApp</TargetFrameworkIdentifier>
+    <OutputType>exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Optimize>true</Optimize>
+    <!-- This test provides no interesting scenarios for GCStress -->
+    <GCStressIncompatible>true</GCStressIncompatible>
+    <!-- The test launches a secondary process and process launch creates
+    an infinite event loop in the SocketAsyncEngine on Linux. Since
+    runincontext loads even framework assemblies into the unloadable
+    context, locals in this loop prevent unloading -->
+    <UnloadabilityIncompatible>true</UnloadabilityIncompatible>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildProjectName).cs" />
+    <ProjectReference Include="$(TestSourceDir)Common/CoreCLRTestLibrary/CoreCLRTestLibrary.csproj" />
+    <ProjectReference Include="../common/profiler_common.csproj" />
+    <CMakeProjectReference Include="$(MSBuildThisFileDirectory)/../native/CMakeLists.txt" />
+  </ItemGroup>
+</Project>

src/tests/profiler/native/CMakeLists.txt

@@ -8,6 +8,7 @@ set(SOURCES
     eventpipeprofiler/eventpipewritingprofiler.cpp
     eventpipeprofiler/eventpipemetadatareader.cpp
     gcallocateprofiler/gcallocateprofiler.cpp
+    nongcheap/nongcheap.cpp
     gcbasicprofiler/gcbasicprofiler.cpp
     gcprofiler/gcprofiler.cpp
     getappdomainstaticaddress/getappdomainstaticaddress.cpp

src/tests/profiler/native/classfactory.cpp

@@ -7,6 +7,7 @@
 #include "eventpipeprofiler/eventpipewritingprofiler.h"
 #include "getappdomainstaticaddress/getappdomainstaticaddress.h"
 #include "gcallocateprofiler/gcallocateprofiler.h"
+#include "nongcheap/nongcheap.h"
 #include "gcbasicprofiler/gcbasicprofiler.h"
 #include "gcprofiler/gcprofiler.h"
 #include "handlesprofiler/handlesprofiler.h"
@@ -69,6 +70,10 @@ HRESULT STDMETHODCALLTYPE ClassFactory::CreateInstance(IUnknown *pUnkOuter, REFI
     {
         profiler = new GCAllocateProfiler();
     }
+    else if (clsid == NonGcHeapProfiler::GetClsid())
+    {
+        profiler = new NonGcHeapProfiler();
+    }
     else if (clsid == GCBasicProfiler::GetClsid())
     {
         profiler = new GCBasicProfiler();

src/tests/profiler/native/nongcheap/nongcheap.cpp

@@ -0,0 +1,74 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#include "nongcheap.h"
+
+GUID NonGcHeapProfiler::GetClsid()
+{
+    // {EF0D191C-3FC7-4311-88AF-E474CBEB2859}
+    GUID clsid = { 0xef0d191c, 0x3fc7, 0x4311, { 0x88, 0xaf, 0xe4, 0x74, 0xcb, 0xeb, 0x28, 0x59 } };
+    return clsid;
+}
+
+HRESULT NonGcHeapProfiler::Initialize(IUnknown* pICorProfilerInfoUnk)
+{
+    Profiler::Initialize(pICorProfilerInfoUnk);
+
+    HRESULT hr = S_OK;
+    if (FAILED(hr = pCorProfilerInfo->SetEventMask2(
+        COR_PRF_ENABLE_OBJECT_ALLOCATED | COR_PRF_MONITOR_OBJECT_ALLOCATED,
+        COR_PRF_HIGH_BASIC_GC)))
+    {
+        printf("FAIL: ICorProfilerInfo::SetEventMask2() failed hr=0x%x", hr);
+        return hr;
+    }
+
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE NonGcHeapProfiler::ObjectAllocated(ObjectID objectId, ClassID classId)
+{
+    COR_PRF_GC_GENERATION_RANGE gen;
+    HRESULT hr = pCorProfilerInfo->GetObjectGeneration(objectId, &gen);
+
+    // non-GC objects (same for GC.GetGeneration() API) have generation = -1
+    if (gen.generation == (COR_PRF_GC_GENERATION)-1)
+    {
+        if (!FAILED(hr))
+        {
+            // We expect GetObjectGeneration to return an error (CORPROF_E_NOT_GC_OBJECT)
+            // for non-GC objects.
+            _failures++;
+        }
+        _nonGcHeapObjects++;
+        if (gen.rangeLength != 0 || gen.rangeLengthReserved != 0 || gen.rangeStart != 0)
+        {
+            _failures++;
+        }
+    }
+    else if (FAILED(hr))
+    {
+        _failures++;
+    }
+    return S_OK;
+}
+
+HRESULT NonGcHeapProfiler::Shutdown()
+{
+    if (_failures > 0)
+    {
+        printf("PROFILER TEST FAILS\n");
+    }
+    else if (_nonGcHeapObjects == 0)
+    {
+        printf("PROFILER TEST FAILS: non-GC heap objects were not allocated\n");
+    }
+    else
+    {
+        printf("PROFILER TEST PASSES\n");
+    }
+    printf("Non-GC objects allocated: %d\n", (int)_nonGcHeapObjects);
+    printf("PROFILER TEST PASSES\n");
+    fflush(stdout);
+    return S_OK;
+}

src/tests/profiler/native/nongcheap/nongcheap.h

@@ -0,0 +1,24 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+#pragma once
+
+#include "../profiler.h"
+
+class NonGcHeapProfiler : public Profiler
+{
+public:
+    NonGcHeapProfiler() : Profiler(),
+        _nonGcHeapObjects(0),
+        _failures(0)
+    {}
+
+	static GUID GetClsid();
+    virtual HRESULT STDMETHODCALLTYPE Initialize(IUnknown* pICorProfilerInfoUnk);
+    virtual HRESULT STDMETHODCALLTYPE ObjectAllocated(ObjectID objectId, ClassID classId);
+    virtual HRESULT STDMETHODCALLTYPE Shutdown();
+
+private:
+    std::atomic<int> _nonGcHeapObjects;
+    std::atomic<int> _failures;
+};