Skip to content

Commit 2df640c

Browse files
authored
[NativeAOT] Fix cut & paste errors (#98686)
* Fix cut & paste errors * Add EBP versions too.
1 parent 2e5d409 commit 2df640c

File tree

2 files changed

+12
-7
lines changed

2 files changed

+12
-7
lines changed

src/coreclr/nativeaot/Runtime/windows/CoffNativeCodeManager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ bool CoffNativeCodeManager::UnwindStackFrame(MethodInfo * pMethodInfo,
593593
return true;
594594
}
595595
#else
596-
PORTABILITY_ASSERT("GetConservativeUpperBoundForOutgoingArgs");
596+
PORTABILITY_ASSERT("UnwindStackFrame");
597597
RhFailFast();
598598
#endif
599599
}

src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/JitHelper.cs

+11-6
Original file line numberDiff line numberDiff line change
@@ -80,27 +80,32 @@ public static void GetEntryPoint(TypeSystemContext context, ReadyToRunHelper id,
8080
mangledName = "RhpAssignRefECX";
8181
break;
8282
case ReadyToRunHelper.WriteBarrier_EDI:
83-
mangledName = "RhpAssignRefECX";
83+
mangledName = "RhpAssignRefEDI";
8484
break;
8585
case ReadyToRunHelper.WriteBarrier_ESI:
86-
mangledName = "RhpAssignRefECX";
86+
mangledName = "RhpAssignRefESI";
87+
break;
88+
case ReadyToRunHelper.WriteBarrier_EBP:
89+
mangledName = "RhpAssignRefEBP";
8790
break;
8891
case ReadyToRunHelper.CheckedWriteBarrier_EAX:
8992
mangledName = "RhpCheckedAssignRefEAX";
9093
break;
9194
case ReadyToRunHelper.CheckedWriteBarrier_EBX:
92-
mangledName = "RhpCheckedAssignRefEAX";
95+
mangledName = "RhpCheckedAssignRefEBX";
9396
break;
9497
case ReadyToRunHelper.CheckedWriteBarrier_ECX:
9598
mangledName = "RhpCheckedAssignRefECX";
9699
break;
97100
case ReadyToRunHelper.CheckedWriteBarrier_EDI:
98-
mangledName = "RhpCheckedAssignRefECX";
101+
mangledName = "RhpCheckedAssignRefEDI";
99102
break;
100103
case ReadyToRunHelper.CheckedWriteBarrier_ESI:
101-
mangledName = "RhpCheckedAssignRefECX";
104+
mangledName = "RhpCheckedAssignRefESI";
105+
break;
106+
case ReadyToRunHelper.CheckedWriteBarrier_EBP:
107+
mangledName = "RhpCheckedAssignRefEBP";
102108
break;
103-
104109
case ReadyToRunHelper.Box:
105110
case ReadyToRunHelper.Box_Nullable:
106111
mangledName = "RhBox";

0 commit comments

Comments
 (0)