From 95a9055dbe5f6233f75ee2d7b6194e18cc4977fd Mon Sep 17 00:00:00 2001
From: Brian Robbins <brianrob@microsoft.com>
Date: Mon, 14 May 2018 13:44:28 -0700
Subject: [PATCH] Remove usages of AnsiString and replace them with
 UnicodeString. (#17989)

---
 src/vm/ClrEtwAll.man          | 110 +++++++++++++++++++++++++++++++++++++++---
 src/vm/comcallablewrapper.cpp |   9 +++-
 src/vm/jitinterface.cpp       |   9 +++-
 3 files changed, 117 insertions(+), 11 deletions(-)

diff --git a/src/vm/ClrEtwAll.man b/src/vm/ClrEtwAll.man
index 3a35684..441f0a0 100644
--- a/src/vm/ClrEtwAll.man
+++ b/src/vm/ClrEtwAll.man
@@ -1816,7 +1816,7 @@
                         <data name="InlineeName" inType="win:UnicodeString" />
                         <data name="InlineeNameSignature" inType="win:UnicodeString" />
                         <data name="FailAlways" inType="win:Boolean" />
-                        <data name="FailReason" inType="win:AnsiString" />
+                        <data name="FailReason" inType="win:UnicodeString" />
                         <data name="ClrInstanceID" inType="win:UInt16" />
 
                         <UserData>
@@ -1837,6 +1837,38 @@
                         </UserData>
                     </template>
 
+                    <template tid="MethodJitInliningFailedAnsi">
+                        <data name="MethodBeingCompiledNamespace" inType="win:UnicodeString" />
+                        <data name="MethodBeingCompiledName" inType="win:UnicodeString" />
+                        <data name="MethodBeingCompiledNameSignature" inType="win:UnicodeString" />
+                        <data name="InlinerNamespace" inType="win:UnicodeString" />
+                        <data name="InlinerName" inType="win:UnicodeString" />
+                        <data name="InlinerNameSignature" inType="win:UnicodeString" />
+                        <data name="InlineeNamespace" inType="win:UnicodeString" />
+                        <data name="InlineeName" inType="win:UnicodeString" />
+                        <data name="InlineeNameSignature" inType="win:UnicodeString" />
+                        <data name="FailAlways" inType="win:Boolean" />
+                        <data name="FailReason" inType="win:AnsiString" />
+                        <data name="ClrInstanceID" inType="win:UInt16" />
+
+                        <UserData>
+                            <MethodJitInliningFailedAnsi xmlns="myNs">
+                                <MethodBeingCompiledNamespace> %1 </MethodBeingCompiledNamespace>
+                                <MethodBeingCompiledName> %2 </MethodBeingCompiledName>
+                                <MethodBeingCompiledNameSignature> %3 </MethodBeingCompiledNameSignature>
+                                <InlinerNamespace> %4 </InlinerNamespace>
+                                <InlinerName> %5 </InlinerName>
+                                <InlinerNameSignature> %6 </InlinerNameSignature>
+                                <InlineeNamespace> %7 </InlineeNamespace>
+                                <InlineeName> %8 </InlineeName>
+                                <InlineeNameSignature> %9 </InlineeNameSignature>
+                                <FailAlways> %10 </FailAlways>
+                                <FailReason> %11 </FailReason>
+                                <ClrInstanceID> %12 </ClrInstanceID>
+                            </MethodJitInliningFailedAnsi>
+                        </UserData>
+                    </template>
+
                     <template tid="MethodJitTailCallSucceeded">
                         <data name="MethodBeingCompiledNamespace" inType="win:UnicodeString" />
                         <data name="MethodBeingCompiledName" inType="win:UnicodeString" />
@@ -1880,7 +1912,7 @@
                         <data name="CalleeName" inType="win:UnicodeString" />
                         <data name="CalleeNameSignature" inType="win:UnicodeString" />
                         <data name="TailPrefix" inType="win:Boolean" />
-                        <data name="FailReason" inType="win:AnsiString" />
+                        <data name="FailReason" inType="win:UnicodeString" />
                         <data name="ClrInstanceID" inType="win:UInt16" />
 
                         <UserData>
@@ -1900,6 +1932,38 @@
                             </MethodJitTailCallFailed>
                         </UserData>
                     </template>
+
+                    <template tid="MethodJitTailCallFailedAnsi">
+                        <data name="MethodBeingCompiledNamespace" inType="win:UnicodeString" />
+                        <data name="MethodBeingCompiledName" inType="win:UnicodeString" />
+                        <data name="MethodBeingCompiledNameSignature" inType="win:UnicodeString" />
+                        <data name="CallerNamespace" inType="win:UnicodeString" />
+                        <data name="CallerName" inType="win:UnicodeString" />
+                        <data name="CallerNameSignature" inType="win:UnicodeString" />
+                        <data name="CalleeNamespace" inType="win:UnicodeString" />
+                        <data name="CalleeName" inType="win:UnicodeString" />
+                        <data name="CalleeNameSignature" inType="win:UnicodeString" />
+                        <data name="TailPrefix" inType="win:Boolean" />
+                        <data name="FailReason" inType="win:AnsiString" />
+                        <data name="ClrInstanceID" inType="win:UInt16" />
+
+                        <UserData>
+                            <MethodJitTailCallFailedAnsi xmlns="myNs">
+                                <MethodBeingCompiledNamespace> %1 </MethodBeingCompiledNamespace>
+                                <MethodBeingCompiledName> %2 </MethodBeingCompiledName>
+                                <MethodBeingCompiledNameSignature> %3 </MethodBeingCompiledNameSignature>
+                                <CallerNamespace> %4 </CallerNamespace>
+                                <CallerName> %5 </CallerName>
+                                <CallerNameSignature> %6 </CallerNameSignature>
+                                <CalleeNamespace> %7 </CalleeNamespace>
+                                <CalleeName> %8 </CalleeName>
+                                <CalleeNameSignature> %9 </CalleeNameSignature>
+                                <TailPrefix> %10 </TailPrefix>
+                                <FailReason> %11 </FailReason>
+                                <ClrInstanceID> %12 </ClrInstanceID>
+                            </MethodJitTailCallFailedAnsi>
+                        </UserData>
+                    </template>
                     
                     <template tid="MethodILToNativeMap">
                       <data name="MethodID" inType="win:UInt64" outType="win:HexInt64" />
@@ -2961,10 +3025,10 @@
                            symbol="MethodJitInliningSucceeded"
                            message="$(string.RuntimePublisher.MethodJitInliningSucceededEventMessage)"/>
 
-                    <event value="186" version="0" level="win:Verbose"  template="MethodJitInliningFailed"
+                    <event value="186" version="0" level="win:Verbose"  template="MethodJitInliningFailedAnsi"
                            keywords ="JitTracingKeyword" opcode="JitInliningFailed"
                            task="CLRMethod"
-                           symbol="MethodJitInliningFailed"
+                           symbol="MethodJitInliningFailedAnsi"
                            message="$(string.RuntimePublisher.MethodJitInliningFailedEventMessage)"/>
 
                     <event value="188" version="0" level="win:Verbose"  template="MethodJitTailCallSucceeded"
@@ -2973,10 +3037,10 @@
                            symbol="MethodJitTailCallSucceeded"
                            message="$(string.RuntimePublisher.MethodJitTailCallSucceededEventMessage)"/>
 
-                    <event value="189" version="0" level="win:Verbose"  template="MethodJitTailCallFailed"
+                    <event value="189" version="0" level="win:Verbose"  template="MethodJitTailCallFailedAnsi"
                            keywords ="JitTracingKeyword" opcode="JitTailCallFailed"
                            task="CLRMethod"
-                           symbol="MethodJitTailCallFailed"
+                           symbol="MethodJitTailCallFailedAnsi"
                            message="$(string.RuntimePublisher.MethodJitTailCallFailedEventMessage)"/>
 
                     <event value="190" version="0" level="win:Verbose"  template="MethodILToNativeMap"
@@ -2985,6 +3049,18 @@
                            symbol="MethodILToNativeMap"
                            message="$(string.RuntimePublisher.MethodILToNativeMapEventMessage)"/>
 
+                    <event value="191" version="0" level="win:Verbose"  template="MethodJitTailCallFailed"
+                           keywords ="JitTracingKeyword" opcode="JitTailCallFailed"
+                           task="CLRMethod"
+                           symbol="MethodJitTailCallFailed"
+                           message="$(string.RuntimePublisher.MethodJitTailCallFailedEventMessage)"/>
+
+                    <event value="192" version="0" level="win:Verbose"  template="MethodJitInliningFailed"
+                           keywords ="JitTracingKeyword" opcode="JitInliningFailed"
+                           task="CLRMethod"
+                           symbol="MethodJitInliningFailed"
+                           message="$(string.RuntimePublisher.MethodJitInliningFailedEventMessage)"/>
+
                     <!-- CLR Loader events -->
                     <!-- The following 2 events are now defunct -->
                     <event value="149" version="0" level="win:Informational"  template="ModuleLoadUnload"
@@ -5057,6 +5133,18 @@
                         <data name="COMInterfacePointer" inType="win:Pointer" />
                         <data name="NewRefCount" inType="win:UInt32" />
                         <data name="AppDomainID" inType="win:UInt64" outType="win:HexInt64" />
+                        <data name="ClassName" inType="win:UnicodeString" />
+                        <data name="NameSpace" inType="win:UnicodeString" />
+                        <data name="Operation" inType="win:UnicodeString" />
+                        <data name="ClrInstanceID" inType="win:UInt16" />
+                    </template>
+
+                    <template tid="CCWRefCountChangeAnsi">
+                        <data name="HandleID" inType="win:Pointer" />
+                        <data name="ObjectID" inType="win:Pointer" />
+                        <data name="COMInterfacePointer" inType="win:Pointer" />
+                        <data name="NewRefCount" inType="win:UInt32" />
+                        <data name="AppDomainID" inType="win:UInt64" outType="win:HexInt64" />
                         <data name="ClassName" inType="win:AnsiString" />
                         <data name="NameSpace" inType="win:AnsiString" />
                         <data name="Operation" inType="win:UnicodeString" />
@@ -6017,11 +6105,11 @@
                            task="GarbageCollectionPrivate"
                            symbol="PrvFinalizeObject" message="$(string.PrivatePublisher.FinalizeObjectEventMessage)"/>
 
-                    <event value="193" version="0" level="win:Verbose"  template="CCWRefCountChange"
+                    <event value="193" version="0" level="win:Verbose"  template="CCWRefCountChangeAnsi"
                            keywords="InteropPrivateKeyword"  
                            opcode="CCWRefCountChange"
                            task="GarbageCollectionPrivate"
-                           symbol="CCWRefCountChange" message="$(string.PrivatePublisher.CCWRefCountChangeEventMessage)"/>
+                           symbol="CCWRefCountChangeAnsi" message="$(string.PrivatePublisher.CCWRefCountChangeEventMessage)"/>
 
                     <event value="194" version="0" level="win:Verbose"  template="PrvSetGCHandle"
                            keywords="GCHandlePrivateKeyword"  
@@ -6051,6 +6139,12 @@
                            task="GarbageCollectionPrivate"
                            symbol="PinPlugAtGCTime" message="$(string.PrivatePublisher.PinPlugAtGCTimeEventMessage)"/>
 
+                    <event value="200" version="0" level="win:Verbose"  template="CCWRefCountChange"
+                           keywords="InteropPrivateKeyword"  
+                           opcode="CCWRefCountChange"
+                           task="GarbageCollectionPrivate"
+                           symbol="CCWRefCountChange" message="$(string.PrivatePublisher.CCWRefCountChangeEventMessage)"/>
+
                     <event value="310" version="0" level="win:Verbose" template="LoaderHeapPrivate"
                            keywords="LoaderHeapPrivateKeyword" opcode="AllocRequest"
                            task="LoaderHeapAllocation" symbol="AllocRequest" message="$(string.PrivatePublisher.AllocRequestEventMessage)" />
diff --git a/src/vm/comcallablewrapper.cpp b/src/vm/comcallablewrapper.cpp
index 5c2e187..ad62405 100644
--- a/src/vm/comcallablewrapper.cpp
+++ b/src/vm/comcallablewrapper.cpp
@@ -958,13 +958,20 @@ void SimpleComCallWrapper::BuildRefCountLogMessage(LPCWSTR wszOperation, StackSS
             obj = *((_UNCHECKED_OBJECTREF *)(handle));
 
         if (ETW_EVENT_ENABLED(MICROSOFT_WINDOWS_DOTNETRUNTIME_PRIVATE_PROVIDER_Context, CCWRefCountChange)) 
+        {
+            SString className;
+            className.SetUTF8(pszClassName);
+            SString nameSpace;
+            nameSpace.SetUTF8(pszNamespace);
+
             FireEtwCCWRefCountChange(
                 handle, 
                 (Object *)obj, 
                 this, 
                 dwEstimatedRefCount, 
                 NULL,                   // domain value is not interesting in CoreCLR
-                pszClassName, pszNamespace, wszOperation, GetClrInstanceId());
+                className.GetUnicode(), nameSpace.GetUnicode(), wszOperation, GetClrInstanceId());
+        }
         
         if (g_pConfig->ShouldLogCCWRefCountChange(pszClassName, pszNamespace))
         {
diff --git a/src/vm/jitinterface.cpp b/src/vm/jitinterface.cpp
index a45da2d..99fa53d 100644
--- a/src/vm/jitinterface.cpp
+++ b/src/vm/jitinterface.cpp
@@ -8040,6 +8040,9 @@ void CEEInfo::reportInliningDecision (CORINFO_METHOD_HANDLE inlinerHnd,
         if (dontInline(inlineResult))
         {
             const char * str = (reason ? reason : "");
+            SString strReason;
+            strReason.SetANSI(str);
+
 
             FireEtwMethodJitInliningFailed(methodBeingCompiledNames[0].GetUnicode(),
                                            methodBeingCompiledNames[1].GetUnicode(),
@@ -8051,7 +8054,7 @@ void CEEInfo::reportInliningDecision (CORINFO_METHOD_HANDLE inlinerHnd,
                                            inlineeNames[1].GetUnicode(),
                                            inlineeNames[2].GetUnicode(),
                                            inlineResult == INLINE_NEVER,
-                                           str,
+                                           strReason.GetUnicode(),
                                            GetClrInstanceId());
         }
         else
@@ -8364,6 +8367,8 @@ void CEEInfo::reportTailCallDecision (CORINFO_METHOD_HANDLE callerHnd,
         if (tailCallResult == TAILCALL_FAIL)
         {
             const char * str = (reason ? reason : "");
+            SString strReason;
+            strReason.SetANSI(str);
 
             FireEtwMethodJitTailCallFailed(methodBeingCompiledNames[0].GetUnicode(),
                                            methodBeingCompiledNames[1].GetUnicode(),
@@ -8375,7 +8380,7 @@ void CEEInfo::reportTailCallDecision (CORINFO_METHOD_HANDLE callerHnd,
                                            calleeNames[1].GetUnicode(),
                                            calleeNames[2].GetUnicode(),
                                            fIsTailPrefix,
-                                           str,
+                                           strReason.GetUnicode(),
                                            GetClrInstanceId());
         }
         else
-- 
2.7.4