resolve merge errors

dotnet · Nov 18, 2024 · 51e95b3 · 51e95b3
1 parent c77bdd9
commit 51e95b3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/coreclr/jit/codegenlinear.cpp b/src/coreclr/jit/codegenlinear.cpp
@@ -2702,7 +2702,7 @@ void CodeGen::genEmitterUnitTests()
     {
         genAmd64EmitterUnitTestsSse2();
     }
-    if (unitTestSectionAll || (u16_strstr(unitTestSection, W("apx")) != nullptr))
+    if (unitTestSectionAll || (strstr(unitTestSection, "apx") != nullptr))
     {
         genAmd64EmitterUnitTestsApx();
     }

diff --git a/src/coreclr/jit/jitconfigvalues.h b/src/coreclr/jit/jitconfigvalues.h
@@ -363,11 +363,11 @@ RELEASE_CONFIG_INTEGER(EnableEHWriteThru, "EnableEHWriteThru", 1)
 RELEASE_CONFIG_INTEGER(EnableMultiRegLocals, "EnableMultiRegLocals", 1)
 
 // Disables inlining of all methods
-RELEASE_CONFIG_INTEGER(JitNoInline, W("JitNoInline"), 0)
+RELEASE_CONFIG_INTEGER(JitNoInline, "JitNoInline", 0)
 
 #if defined(DEBUG)
-CONFIG_INTEGER(JitStressRex2Encoding, W("JitStressRex2Encoding"), 0) // Enable rex2 encoding for legacy instructions.                                                                     
-CONFIG_INTEGER(JitBypassAPXCheck, W("JitBypassAPXCheck"), 0) // Bypass APX CPUID check.                                                                     
+CONFIG_INTEGER(JitStressRex2Encoding, "JitStressRex2Encoding", 0) // Enable rex2 encoding for legacy instructions.                                                                     
+CONFIG_INTEGER(JitBypassAPXCheck, "JitBypassAPXCheck", 0) // Bypass APX CPUID check.                                                                     
 #endif
 
 // clang-format off