diff --git a/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs b/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs index 844cf58f20bd7..1fc9bbf1bc93b 100644 --- a/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs +++ b/src/coreclr/tools/Common/Compiler/NativeAotNameMangler.cs @@ -344,7 +344,7 @@ public override Utf8String GetMangledMethodName(MethodDesc method) Utf8StringBuilder sb = new Utf8StringBuilder(); sb.Append(GetMangledTypeName(method.OwningType)); - sb.Append("__"); + sb.Append("__"u8); sb.Append(GetUnqualifiedMangledMethodName(method)); utf8MangledName = sb.ToUtf8String(); @@ -391,7 +391,7 @@ private Utf8String GetPrefixMangledSignatureName(IPrefixMangledSignature prefixM for (int i = 0; i < signature.Length; i++) { - sb.Append("__"); + sb.Append("__"u8); string sigArgName = GetMangledTypeName(signature[i]); sb.Append(sigArgName); } @@ -451,7 +451,7 @@ private Utf8String ComputeUnqualifiedMangledMethodName(MethodDesc method) { string instArgName = GetMangledTypeName(inst[i]); if (i > 0) - sb.Append("__"); + sb.Append("__"u8); sb.Append(instArgName); } diff --git a/src/coreclr/tools/Common/Internal/Text/Utf8String.cs b/src/coreclr/tools/Common/Internal/Text/Utf8String.cs index 360aa3d27e943..3614639fc99c6 100644 --- a/src/coreclr/tools/Common/Internal/Text/Utf8String.cs +++ b/src/coreclr/tools/Common/Internal/Text/Utf8String.cs @@ -7,9 +7,9 @@ namespace Internal.Text { - public struct Utf8String : IEquatable, IComparable + public readonly struct Utf8String : IEquatable, IComparable { - private byte[] _value; + private readonly byte[] _value; public Utf8String(byte[] underlyingArray) { @@ -21,8 +21,6 @@ public Utf8String(string s) _value = Encoding.UTF8.GetBytes(s); } - // TODO: This should return ReadOnlySpan instead once available - public byte[] UnderlyingArray => _value; public int Length => _value.Length; // For now, define implicit conversions between string and Utf8String to aid the transition @@ -32,6 +30,8 @@ public static implicit operator Utf8String(string s) return new Utf8String(s); } + public ReadOnlySpan AsSpan() => _value; + public override string ToString() { return Encoding.UTF8.GetString(_value); @@ -39,7 +39,7 @@ public override string ToString() public override bool Equals(object obj) { - return (obj is Utf8String) && Equals((Utf8String)obj); + return (obj is Utf8String utf8String) && Equals(utf8String); } public override unsafe int GetHashCode() @@ -72,67 +72,12 @@ public override unsafe int GetHashCode() public bool Equals(Utf8String other) { - int length = _value.Length; - if (length != other.Length) - return false; - - if (_value == other._value) - return true; - - unsafe - { - fixed (byte* ap = _value) fixed (byte* bp = other._value) - { - byte* a = ap; - byte* b = bp; - - while (length >= 4) - { - if (*(int*)a != *(int*)b) return false; - a += 4; b += 4; length -= 4; - } - if (length >= 2) - { - if (*(short*)a != *(short*)b) return false; - a += 2; b += 2; length -= 2; - } - if (length > 0) - { - if (*a != *b) return false; - } - return true; - } - } + return AsSpan().SequenceEqual(other.AsSpan()); } private static int Compare(Utf8String strA, Utf8String strB) { - int length = Math.Min(strA.Length, strB.Length); - - unsafe - { - fixed (byte* ap = strA._value) - fixed (byte* bp = strB._value) - { - byte* a = ap; - byte* b = bp; - - while (length > 0) - { - if (*a != *b) - return *a - *b; - a += 1; - b += 1; - length -= 1; - } - - // At this point, we have compared all the characters in at least one string. - // The longer string will be larger. - // We could optimize and compare lengths before iterating strings, but we want - // Foo and Foo1 to be sorted adjacent to eachother. - return strA.Length - strB.Length; - } - } + return strA.AsSpan().SequenceCompareTo(strB.AsSpan()); } public int CompareTo(Utf8String other) diff --git a/src/coreclr/tools/Common/Internal/Text/Utf8StringBuilder.cs b/src/coreclr/tools/Common/Internal/Text/Utf8StringBuilder.cs index edf5b185b3c44..ee438c6e2209b 100644 --- a/src/coreclr/tools/Common/Internal/Text/Utf8StringBuilder.cs +++ b/src/coreclr/tools/Common/Internal/Text/Utf8StringBuilder.cs @@ -16,10 +16,10 @@ public Utf8StringBuilder() { } - // TODO: This should return ReadOnlySpan instead once available - public byte[] UnderlyingArray => _buffer; public int Length => _length; + public ReadOnlySpan AsSpan() => _buffer.AsSpan(0, _length); + public Utf8StringBuilder Clear() { _length = 0; @@ -35,39 +35,33 @@ public Utf8StringBuilder Truncate(int newLength) public Utf8StringBuilder Append(Utf8String value) { - return Append(value.UnderlyingArray); + return Append(value.AsSpan()); } - public Utf8StringBuilder Append(byte[] value) + public Utf8StringBuilder Append(ReadOnlySpan value) { Ensure(value.Length); - Buffer.BlockCopy(value, 0, _buffer, _length, value.Length); + value.CopyTo(_buffer.AsSpan(_length)); _length += value.Length; return this; } public Utf8StringBuilder Append(char value) { + Debug.Assert(Ascii.IsValid(value)); + Ensure(1); - if (value > 0x7F) - return Append(Encoding.UTF8.GetBytes(new char[] { value })); _buffer[_length++] = (byte)value; return this; } public Utf8StringBuilder Append(string value) { - Ensure(value.Length); + int length = Encoding.UTF8.GetByteCount(value); + Ensure(length); - byte[] buffer = _buffer; - for (int i = 0; i < value.Length; i++) - { - char c = value[i]; - if (c > 0x7F) - return Append(Encoding.UTF8.GetBytes(value)); - buffer[_length+i] = (byte)c; - } - _length += value.Length; + Encoding.UTF8.GetBytes(value, _buffer.AsSpan(_length)); + _length += length; return this; } @@ -84,9 +78,7 @@ public string ToString(int start) public Utf8String ToUtf8String() { - var ret = new byte[_length]; - Buffer.BlockCopy(_buffer, 0, ret, 0, _length); - return new Utf8String(ret); + return new Utf8String(AsSpan().ToArray()); } private void Ensure(int extraSpace) @@ -99,53 +91,8 @@ private void Grow(int extraSpace) { int newSize = Math.Max(2 * _buffer.Length, _length + extraSpace); byte[] newBuffer = new byte[newSize]; - Buffer.BlockCopy(_buffer, 0, newBuffer, 0, _length); + AsSpan().CopyTo(newBuffer); _buffer = newBuffer; } - - // Find the boundary of the last character prior to a position - // If pos points to the last byte of a char, then return pos; Otherwise, - // return the position of the last byte of the preceding char. - public int LastCharBoundary(int pos) - { - Debug.Assert(pos < _length); - - if (_buffer[pos] < 128 /*10000000*/) - { - // This is a single byte character - return pos; - } - - int origPos = pos; - - // Skip following bytes of a multi-byte character until the first byte is seen - while (_buffer[pos] < 192 /*11000000*/) - { - pos--; - } - - if (pos == origPos - 3) - { - // We just skipped a four-byte character - Debug.Assert(_buffer[pos] >= 240 /*11110000*/); - return origPos; - } - - if (pos == origPos - 2 && _buffer[pos] < 240 && _buffer[pos] >= 224 /*11100000*/) - { - // We just skipped a three-byte character - return origPos; - } - - if (pos == origPos - 1 && _buffer[pos] < 224) - { - // We just skipped a two-byte character - Debug.Assert(_buffer[pos] >= 192 /*11000000*/); - return origPos; - } - - // We were in the middle of a multi-byte character - return pos - 1; - } } } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DelegateCreationInfo.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DelegateCreationInfo.cs index 981d7a183b14b..9a40ecdb31f06 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DelegateCreationInfo.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DelegateCreationInfo.cs @@ -306,20 +306,20 @@ public static DelegateCreationInfo Create(TypeDesc delegateType, MethodDesc targ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__DelegateCtor_"); + sb.Append("__DelegateCtor_"u8); if (TargetNeedsVTableLookup) - sb.Append("FromVtbl_"); + sb.Append("FromVtbl_"u8); Constructor.AppendMangledName(nameMangler, sb); - sb.Append("__"); + sb.Append("__"u8); sb.Append(nameMangler.GetMangledMethodName(_targetMethod)); if (_constrainedType != null) { - sb.Append("__"); + sb.Append("__"u8); nameMangler.GetMangledTypeName(_constrainedType); } if (Thunk != null) { - sb.Append("__"); + sb.Append("__"u8); Thunk.AppendMangledName(nameMangler, sb); } } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayMapNode.cs index f8207e8454f9c..19e7b8866f5bd 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayMapNode.cs @@ -26,7 +26,7 @@ public ArrayMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__array_type_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__array_type_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs index a2bc613dcbd4f..e8f08aa357f2b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs @@ -114,7 +114,7 @@ public EmbeddedPointerIndirectionWithSymbolNode(ArrayOfEmbeddedPointersNode _size.Value; public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) - => sb.Append(nameMangler.CompilationUnitPrefix).Append("__FrozenSegmentStart"); + => sb.Append(nameMangler.CompilationUnitPrefix).Append("__FrozenSegmentStart"u8); public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ByRefTypeMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ByRefTypeMapNode.cs index b1a97f9d5bf7f..9f23b8a85cc36 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ByRefTypeMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ByRefTypeMapNode.cs @@ -25,7 +25,7 @@ public ByRefTypeMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__byref_type_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__byref_type_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ClassConstructorContextMap.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ClassConstructorContextMap.cs index ec0e162367693..a12e604b44cd0 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ClassConstructorContextMap.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ClassConstructorContextMap.cs @@ -25,7 +25,7 @@ public ClassConstructorContextMap(ExternalReferencesTableNode externalReferences public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__type_to_cctorContext_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__type_to_cctorContext_map"u8); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DehydratedDataNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DehydratedDataNode.cs index d2490fea2fc59..1b762d533c684 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DehydratedDataNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DehydratedDataNode.cs @@ -46,7 +46,7 @@ internal sealed class DehydratedDataNode : ObjectNode, ISymbolDefinitionNode, IN public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__dehydrated_data"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__dehydrated_data"u8); } protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DelegateMarshallingStubMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DelegateMarshallingStubMapNode.cs index 2111f081a697d..7ea248989915b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DelegateMarshallingStubMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/DelegateMarshallingStubMapNode.cs @@ -28,7 +28,7 @@ public DelegateMarshallingStubMapNode(ExternalReferencesTableNode externalRefere public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__delegate_marshalling_stub_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__delegate_marshalling_stub_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs index 7038e6f1dc208..e94790552aa7f 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeNode.cs @@ -1469,7 +1469,7 @@ public override ObjectNodeSection GetSection(NodeFactory factory) public override bool StaticDependenciesAreComputed => true; public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) - => sb.Append("__writableData").Append(nameMangler.GetMangledTypeName(_type.Type)); + => sb.Append("__writableData"u8).Append(nameMangler.GetMangledTypeName(_type.Type)); public int Offset => 0; public override bool IsShareable => true; public override bool ShouldSkipEmittingObjectNode(NodeFactory factory) => _type.ShouldSkipEmittingObjectNode(factory); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeOptionalFieldsNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeOptionalFieldsNode.cs index cb10e790d4176..592e674e5f5b3 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeOptionalFieldsNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EETypeOptionalFieldsNode.cs @@ -26,7 +26,7 @@ public override ObjectNodeSection GetSection(NodeFactory factory) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__optionalfields_"); + sb.Append("__optionalfields_"u8); _owner.AppendMangledName(nameMangler, sb); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EmbeddedPointerIndirectionNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EmbeddedPointerIndirectionNode.cs index 20be29d3e01f5..e707e28af611a 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EmbeddedPointerIndirectionNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/EmbeddedPointerIndirectionNode.cs @@ -49,7 +49,7 @@ public override void EncodeData(ref ObjectDataBuilder dataBuilder, NodeFactory f public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("_embedded_ptr_"); + sb.Append("_embedded_ptr_"u8); Target.AppendMangledName(nameMangler, sb); } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExactMethodInstantiationsNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExactMethodInstantiationsNode.cs index 46d38a7b9857b..3e6e12b9b0e6d 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExactMethodInstantiationsNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ExactMethodInstantiationsNode.cs @@ -25,7 +25,7 @@ public ExactMethodInstantiationsNode(ExternalReferencesTableNode externalReferen public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__exact_method_instantiations"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__exact_method_instantiations"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenRuntimeTypeNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenRuntimeTypeNode.cs index 5f0cb71046c80..df38758e7deee 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenRuntimeTypeNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenRuntimeTypeNode.cs @@ -23,7 +23,7 @@ public FrozenRuntimeTypeNode(TypeDesc type, bool constructed) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__RuntimeType_").Append(nameMangler.GetMangledTypeName(_type)); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__RuntimeType_"u8).Append(nameMangler.GetMangledTypeName(_type)); } protected override int ContentSize => ObjectType.InstanceByteCount.AsInt; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenStringNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenStringNode.cs index f00c508f26524..a115db34764ba 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenStringNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FrozenStringNode.cs @@ -19,7 +19,7 @@ public FrozenStringNode(string data, CompilerTypeSystemContext context) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__Str_").Append(nameMangler.GetMangledStringName(_data)); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__Str_"u8).Append(nameMangler.GetMangledStringName(_data)); } protected override int ContentSize => _stringType.Context.Target.PointerSize + sizeof(int) + (_data.Length + 1) * sizeof(char); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FunctionPointerMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FunctionPointerMapNode.cs index 979b8d4ef618a..5273c447780af 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FunctionPointerMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/FunctionPointerMapNode.cs @@ -26,7 +26,7 @@ public FunctionPointerMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__fnptr_type_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__fnptr_type_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs index f8217164be842..62df975327641 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GCStaticEETypeNode.cs @@ -41,7 +41,7 @@ protected override ObjectNodeSection GetDehydratedSection(NodeFactory factory) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__GCStaticEEType_").Append(_gcMap.ToString()); + sb.Append("__GCStaticEEType_"u8).Append(_gcMap.ToString()); } int ISymbolDefinitionNode.Offset diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericCompositionNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericCompositionNode.cs index 447bbfa7b392a..7432bc7ad1f6d 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericCompositionNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericCompositionNode.cs @@ -20,7 +20,7 @@ internal GenericCompositionNode(Instantiation details) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__GenericInstance"); + sb.Append("__GenericInstance"u8); foreach (TypeDesc instArg in _details) { diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericLookupResult.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericLookupResult.cs index 5b37ad7e0acc2..237f33495c030 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericLookupResult.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericLookupResult.cs @@ -187,7 +187,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("TypeHandle_"); + sb.Append("TypeHandle_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -245,7 +245,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("UnwrapNullable_"); + sb.Append("UnwrapNullable_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -296,7 +296,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("MethodHandle_"); + sb.Append("MethodHandle_"u8); sb.Append(nameMangler.GetMangledMethodName(_method)); } @@ -346,7 +346,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("FieldHandle_"); + sb.Append("FieldHandle_"u8); sb.Append(nameMangler.GetMangledFieldName(_field)); } @@ -399,7 +399,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("MethodDictionary_"); + sb.Append("MethodDictionary_"u8); sb.Append(nameMangler.GetMangledMethodName(_method)); } @@ -453,9 +453,9 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { if (!_isUnboxingThunk) - sb.Append("MethodEntry_"); + sb.Append("MethodEntry_"u8); else - sb.Append("UnboxMethodEntry_"); + sb.Append("UnboxMethodEntry_"u8); sb.Append(nameMangler.GetMangledMethodName(_method)); } @@ -534,7 +534,7 @@ contextOwner is TypeDesc ? public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("DispatchCell_"); + sb.Append("DispatchCell_"u8); sb.Append(nameMangler.GetMangledMethodName(_method)); } @@ -585,7 +585,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("NonGCStaticBase_"); + sb.Append("NonGCStaticBase_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -636,7 +636,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("ThreadStaticBase_"); + sb.Append("ThreadStaticBase_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -687,7 +687,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("GCStaticBase_"); + sb.Append("GCStaticBase_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -738,7 +738,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("AllocObject_"); + sb.Append("AllocObject_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -786,7 +786,7 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("DefaultCtor_"); + sb.Append("DefaultCtor_"u8); sb.Append(nameMangler.GetMangledTypeName(_type)); } @@ -903,11 +903,11 @@ public override ISymbolNode GetTarget(NodeFactory factory, GenericLookupResultCo public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("ConstrainedMethodUseLookupResult_"); + sb.Append("ConstrainedMethodUseLookupResult_"u8); sb.Append(nameMangler.GetMangledTypeName(_constraintType)); sb.Append(nameMangler.GetMangledMethodName(_constrainedMethod)); if (_directCall) - sb.Append("Direct"); + sb.Append("Direct"u8); } public override string ToString() => $"ConstrainedMethodUseLookupResult: {_constraintType} {_constrainedMethod} {_directCall}"; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsHashtableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsHashtableNode.cs index 5a3ee2304e26c..04d62dbad5541 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsHashtableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsHashtableNode.cs @@ -25,7 +25,7 @@ public GenericMethodsHashtableNode(ExternalReferencesTableNode externalReference public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__generic_methods_hashtable"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__generic_methods_hashtable"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsTemplateMap.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsTemplateMap.cs index 6230518cf2b25..d0e0382409753 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsTemplateMap.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericMethodsTemplateMap.cs @@ -25,7 +25,7 @@ public GenericMethodsTemplateMap(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__GenericMethodsTemplateMap"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__GenericMethodsTemplateMap"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesHashtableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesHashtableNode.cs index fa1a70b3544ac..3c2835ed9210a 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesHashtableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesHashtableNode.cs @@ -24,7 +24,7 @@ public GenericTypesHashtableNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__generic_types_hashtable"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__generic_types_hashtable"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesTemplateMap.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesTemplateMap.cs index 80f44e60948d4..1e2495ccacb9b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesTemplateMap.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericTypesTemplateMap.cs @@ -25,7 +25,7 @@ public GenericTypesTemplateMap(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__GenericTypesTemplateMap"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__GenericTypesTemplateMap"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVarianceNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVarianceNode.cs index 7fedd00acc87e..3023b166ba914 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVarianceNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVarianceNode.cs @@ -25,7 +25,7 @@ internal GenericVarianceNode(GenericVarianceDetails details) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__GenericVariance"); + sb.Append("__GenericVariance"u8); for (int i = 0; i < _details.Variance.Length; i++) { diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVirtualMethodTableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVirtualMethodTableNode.cs index 7769b2b6a6087..210293d943583 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVirtualMethodTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/GenericVirtualMethodTableNode.cs @@ -28,7 +28,7 @@ public GenericVirtualMethodTableNode(ExternalReferencesTableNode externalReferen public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__gvm_table"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__gvm_table"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellNode.cs index 5d22535ce5e7a..523386d130303 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellNode.cs @@ -30,7 +30,7 @@ public InterfaceDispatchCellNode(MethodDesc targetMethod, ISortableSymbolNode ca public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix) - .Append("__InterfaceDispatchCell_") + .Append("__InterfaceDispatchCell_"u8) .Append(nameMangler.GetMangledMethodName(_targetMethod)); if (_callSiteIdentifier != null) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellSectionNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellSectionNode.cs index 72391f7ddc749..8c611951e99d5 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellSectionNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchCellSectionNode.cs @@ -86,7 +86,7 @@ protected override ObjectData GetDehydratableData(NodeFactory factory, bool relo } public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) - => sb.Append(nameMangler.CompilationUnitPrefix).Append("__InterfaceDispatchCellSection_Start"); + => sb.Append(nameMangler.CompilationUnitPrefix).Append("__InterfaceDispatchCellSection_Start"u8); protected override ObjectNodeSection GetDehydratedSection(NodeFactory factory) => ObjectNodeSection.DataSection; protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs index 45cc7ca69680a..74aee3c3dd5dd 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceDispatchMapNode.cs @@ -31,7 +31,7 @@ public InterfaceDispatchMapNode(NodeFactory factory, TypeDesc type) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__InterfaceDispatchMap_").Append(nameMangler.SanitizeName(nameMangler.GetMangledTypeName(_type))); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__InterfaceDispatchMap_"u8).Append(nameMangler.SanitizeName(nameMangler.GetMangledTypeName(_type))); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceGenericVirtualMethodTableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceGenericVirtualMethodTableNode.cs index 74de063bbd706..a5df57f1f0d3b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceGenericVirtualMethodTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/InterfaceGenericVirtualMethodTableNode.cs @@ -31,7 +31,7 @@ public InterfaceGenericVirtualMethodTableNode(ExternalReferencesTableNode extern public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__interface_gvm_table"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__interface_gvm_table"u8); } int INodeWithSize.Size => _size.Value; public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MetadataNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MetadataNode.cs index ad84d1bd81ed6..a6c7507fc3f53 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MetadataNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MetadataNode.cs @@ -19,7 +19,7 @@ public sealed class MetadataNode : ObjectNode, ISymbolDefinitionNode, INodeWithS public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__embedded_metadata"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__embedded_metadata"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs index df661ea1ad642..17e61805721ea 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/MethodAssociatedDataNode.cs @@ -48,7 +48,7 @@ public override int CompareToImpl(ISortableNode other, CompilerComparer comparer public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("_associatedData_").Append(nameMangler.GetMangledMethodName(_methodNode.Method)); + sb.Append("_associatedData_"u8).Append(nameMangler.GetMangledMethodName(_methodNode.Method)); } public static bool MethodHasAssociatedData(IMethodNode methodNode) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModuleInitializerListNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModuleInitializerListNode.cs index 31f4ecaa871f8..6ba102b11ee0d 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModuleInitializerListNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModuleInitializerListNode.cs @@ -19,7 +19,7 @@ internal sealed class ModuleInitializerListNode : ObjectNode, ISymbolDefinitionN public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__module_initializers"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__module_initializers"u8); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModulesSectionNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModulesSectionNode.cs index 3474a6058232e..3bc379eea93a2 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModulesSectionNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ModulesSectionNode.cs @@ -25,7 +25,7 @@ public override ObjectNodeSection GetSection(NodeFactory factory) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__Module"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__Module"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NativeLayoutInfoNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NativeLayoutInfoNode.cs index 95e7316856750..8e5b9c4734f4b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NativeLayoutInfoNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/NativeLayoutInfoNode.cs @@ -42,7 +42,7 @@ public NativeLayoutInfoNode(ExternalReferencesTableNode externalReferences, Exte public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__nativelayoutinfo"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__nativelayoutinfo"u8); } int INodeWithSize.Size => _size.Value; public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeMethodFixupNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeMethodFixupNode.cs index 866c5d0341bf5..dae41bc1a7701 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeMethodFixupNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeMethodFixupNode.cs @@ -29,7 +29,7 @@ public PInvokeMethodFixupNode(PInvokeMethodData pInvokeMethodData) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__pinvoke_"); + sb.Append("__pinvoke_"u8); _pInvokeMethodData.AppendMangledName(nameMangler, sb); } public int Offset => 0; @@ -230,11 +230,11 @@ public int CompareTo(PInvokeMethodData other, CompilerComparer comparer) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { ModuleData.AppendMangledName(nameMangler, sb); - sb.Append("__"); + sb.Append("__"u8); sb.Append(EntryPointName); if (CharSetMangling != default) { - sb.Append("__"); + sb.Append("__"u8); sb.Append(CharSetMangling.ToString()); } if (SignatureBytes >= 0) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeModuleFixupNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeModuleFixupNode.cs index d696e0075b33e..0adb9c4f1ab34 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeModuleFixupNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PInvokeModuleFixupNode.cs @@ -26,7 +26,7 @@ public PInvokeModuleFixupNode(PInvokeModuleData pInvokeModuleData) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__nativemodule_"); + sb.Append("__nativemodule_"u8); _pInvokeModuleData.AppendMangledName(nameMangler, sb); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PointerTypeMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PointerTypeMapNode.cs index bf2ecfb4c7161..bd54793580f72 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PointerTypeMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/PointerTypeMapNode.cs @@ -25,7 +25,7 @@ public PointerTypeMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__ptr_type_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__ptr_type_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunGenericHelperNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunGenericHelperNode.cs index 284adf484ca6f..5ed898ca170d9 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunGenericHelperNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunGenericHelperNode.cs @@ -335,7 +335,7 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde else mangledContextName = nameMangler.GetMangledTypeName((TypeDesc)_dictionaryOwner); - sb.Append("__GenericLookupFromDict_").Append(mangledContextName).Append("_"); + sb.Append("__GenericLookupFromDict_"u8).Append(mangledContextName).Append("_"u8); AppendLookupSignatureMangledName(nameMangler, sb); } @@ -357,7 +357,7 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde else mangledContextName = nameMangler.GetMangledTypeName((TypeDesc)_dictionaryOwner); - sb.Append("__GenericLookupFromType_").Append(mangledContextName).Append("_"); + sb.Append("__GenericLookupFromType_"u8).Append(mangledContextName).Append("_"u8); AppendLookupSignatureMangledName(nameMangler, sb); } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHeaderNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHeaderNode.cs index e92c6804bbef2..bb5f35f4f8fab 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHeaderNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHeaderNode.cs @@ -34,7 +34,7 @@ public void Add(ReadyToRunSectionType id, T node) where T : ObjectNode, ISymb public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunHeader"); + sb.Append("__ReadyToRunHeader"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHelperNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHelperNode.cs index ab9ccafa2db95..24bda5bb71cdb 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHelperNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReadyToRunHelperNode.cs @@ -92,19 +92,19 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde switch (_id) { case ReadyToRunHelperId.GetNonGCStaticBase: - sb.Append("__GetNonGCStaticBase_").Append(nameMangler.GetMangledTypeName((TypeDesc)_target)); + sb.Append("__GetNonGCStaticBase_"u8).Append(nameMangler.GetMangledTypeName((TypeDesc)_target)); break; case ReadyToRunHelperId.GetGCStaticBase: - sb.Append("__GetGCStaticBase_").Append(nameMangler.GetMangledTypeName((TypeDesc)_target)); + sb.Append("__GetGCStaticBase_"u8).Append(nameMangler.GetMangledTypeName((TypeDesc)_target)); break; case ReadyToRunHelperId.GetThreadStaticBase: - sb.Append("__GetThreadStaticBase_").Append(nameMangler.GetMangledTypeName((TypeDesc)_target)); + sb.Append("__GetThreadStaticBase_"u8).Append(nameMangler.GetMangledTypeName((TypeDesc)_target)); break; case ReadyToRunHelperId.DelegateCtor: ((DelegateCreationInfo)_target).AppendMangledName(nameMangler, sb); break; case ReadyToRunHelperId.ResolveVirtualFunction: - sb.Append("__ResolveVirtualFunction_"); + sb.Append("__ResolveVirtualFunction_"u8); sb.Append(nameMangler.GetMangledMethodName((MethodDesc)_target)); break; default: diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionFieldMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionFieldMapNode.cs index c657327d54782..09835d6ba6077 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionFieldMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionFieldMapNode.cs @@ -28,7 +28,7 @@ public ReflectionFieldMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__field_to_offset_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__field_to_offset_map"u8); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionInvokeMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionInvokeMapNode.cs index e9d5b45d3ee80..a8a4713dcd9ac 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionInvokeMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionInvokeMapNode.cs @@ -29,7 +29,7 @@ public ReflectionInvokeMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__method_to_entrypoint_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__method_to_entrypoint_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionVirtualInvokeMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionVirtualInvokeMapNode.cs index 9c49be270bdd9..fa6bd51940aac 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionVirtualInvokeMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ReflectionVirtualInvokeMapNode.cs @@ -29,7 +29,7 @@ public ReflectionVirtualInvokeMapNode(ExternalReferencesTableNode externalRefere public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__VirtualInvokeMap"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__VirtualInvokeMap"u8); } int INodeWithSize.Size => _size.Value; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceDataNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceDataNode.cs index 6aaac5cd21498..3193d1f8368a7 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceDataNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceDataNode.cs @@ -40,7 +40,7 @@ internal sealed class ResourceDataNode : ObjectNode, ISymbolDefinitionNode, INod public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__embedded_resourcedata"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__embedded_resourcedata"u8); } protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceIndexNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceIndexNode.cs index 847f42cc2a1d1..5909fe3f20bfa 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceIndexNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/ResourceIndexNode.cs @@ -37,7 +37,7 @@ public ResourceIndexNode(ResourceDataNode resourceDataNode) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__embedded_resourceindex"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__embedded_resourceindex"u8); } protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeFieldHandleNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeFieldHandleNode.cs index 6e7631cc1117e..ddb94c51c9df4 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeFieldHandleNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeFieldHandleNode.cs @@ -22,7 +22,7 @@ public RuntimeFieldHandleNode(FieldDesc targetField) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix) - .Append("__RuntimeFieldHandle_") + .Append("__RuntimeFieldHandle_"u8) .Append(nameMangler.GetMangledFieldName(_targetField)); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeMethodHandleNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeMethodHandleNode.cs index c1015fc803d42..6e20a964a64fc 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeMethodHandleNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/RuntimeMethodHandleNode.cs @@ -28,7 +28,7 @@ public RuntimeMethodHandleNode(MethodDesc targetMethod) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix) - .Append("__RuntimeMethodHandle_") + .Append("__RuntimeMethodHandle_"u8) .Append(nameMangler.GetMangledMethodName(_targetMethod)); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SerializedFrozenObjectNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SerializedFrozenObjectNode.cs index 725ea9db9e3e5..fbe021414800b 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SerializedFrozenObjectNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/SerializedFrozenObjectNode.cs @@ -32,7 +32,7 @@ public SerializedFrozenObjectNode(MetadataType owningType, int allocationSiteId, public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__FrozenObj_") + sb.Append(nameMangler.CompilationUnitPrefix).Append("__FrozenObj_"u8) .Append(nameMangler.GetMangledTypeName(_owningType)) .Append(_allocationSiteId.ToStringInvariant()); } diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StackTraceMethodMappingNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StackTraceMethodMappingNode.cs index 1c5fc8658e8be..5c26019f81b8f 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StackTraceMethodMappingNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StackTraceMethodMappingNode.cs @@ -34,7 +34,7 @@ public sealed class StackTraceMethodMappingNode : ObjectNode, ISymbolDefinitionN public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("_stacktrace_methodRVA_to_token_mapping"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("_stacktrace_methodRVA_to_token_mapping"u8); } protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StaticsInfoHashtableNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StaticsInfoHashtableNode.cs index 4a1d8d94f3e90..befd99b90945a 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StaticsInfoHashtableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StaticsInfoHashtableNode.cs @@ -29,7 +29,7 @@ public StaticsInfoHashtableNode(ExternalReferencesTableNode externalReferences, public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("_StaticsInfoHashtableNode"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("_StaticsInfoHashtableNode"u8); } public int Offset => 0; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs index ed0c278aa1150..02089b56ae0d2 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/StructMarshallingStubMapNode.cs @@ -30,7 +30,7 @@ public StructMarshallingStubMapNode(ExternalReferencesTableNode externalReferenc public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__struct_marshalling_stub_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__struct_marshalling_stub_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMInitialInterfaceDispatchStubNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMInitialInterfaceDispatchStubNode.cs index 7b7c6ba688c7b..f4c46917d16ae 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMInitialInterfaceDispatchStubNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/Target_ARM/ARMInitialInterfaceDispatchStubNode.cs @@ -25,7 +25,7 @@ public partial class InitialInterfaceDispatchStubNode : AssemblyStubNode public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("_InitialInterfaceDispatchStub"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("_InitialInterfaceDispatchStub"u8); } public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TlsRootNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TlsRootNode.cs index a26ff9bec28f6..21d9e315ab528 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TlsRootNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TlsRootNode.cs @@ -9,7 +9,7 @@ public class TlsRootNode : ObjectNode, ISymbolDefinitionNode { public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("tls_InlinedThreadStatics"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("tls_InlinedThreadStatics"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeManagerIndirectionNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeManagerIndirectionNode.cs index 5aac937956b1f..37240280b95d8 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeManagerIndirectionNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeManagerIndirectionNode.cs @@ -9,7 +9,7 @@ public class TypeManagerIndirectionNode : ObjectNode, ISymbolDefinitionNode { public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__typemanager_indirection"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__typemanager_indirection"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeMetadataMapNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeMetadataMapNode.cs index a23f5e4540dfa..adc76085ea897 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeMetadataMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/TypeMetadataMapNode.cs @@ -25,7 +25,7 @@ public TypeMetadataMapNode(ExternalReferencesTableNode externalReferences) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append(nameMangler.CompilationUnitPrefix).Append("__type_to_metadata_map"); + sb.Append(nameMangler.CompilationUnitPrefix).Append("__type_to_metadata_map"u8); } public int Offset => 0; public override bool IsShareable => false; diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/UnboxingStubNode.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/UnboxingStubNode.cs index 94808445795fc..bf7eeaea29e91 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/UnboxingStubNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/DependencyAnalysis/UnboxingStubNode.cs @@ -38,7 +38,7 @@ private ISymbolNode GetUnderlyingMethodEntrypoint(NodeFactory factory) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("unbox_").Append(nameMangler.GetMangledMethodName(Method)); + sb.Append("unbox_"u8).Append(nameMangler.GetMangledMethodName(Method)); } public static string GetMangledName(NameMangler nameMangler, MethodDesc method) diff --git a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ObjectWriter/Dwarf/DwarfEhFrame.cs b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ObjectWriter/Dwarf/DwarfEhFrame.cs index 1705a10dd1ab1..3e207ffe29612 100644 --- a/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ObjectWriter/Dwarf/DwarfEhFrame.cs +++ b/src/coreclr/tools/aot/ILCompiler.Compiler/Compiler/ObjectWriter/Dwarf/DwarfEhFrame.cs @@ -81,7 +81,7 @@ private void WriteCie(DwarfCie cie) 4u + // Length 4u + // CIE Offset (0) 1u + // Version - (uint)augmentationString.Length + 1u + + (uint)augmentationString.Length + 1u + // null-terminator DwarfHelper.SizeOfULEB128(cie.CodeAlignFactor) + DwarfHelper.SizeOfSLEB128(cie.DataAlignFactor) + DwarfHelper.SizeOfULEB128(cie.ReturnAddressRegister) + @@ -93,7 +93,8 @@ private void WriteCie(DwarfCie cie) _sectionWriter.WriteLittleEndian(0); _sectionWriter.WriteByte(cie.ReturnAddressRegister < 0x7F ? (byte)1u : (byte)3u); // Version - _sectionWriter.Write(augmentationString.UnderlyingArray); + _sectionWriter.Write(augmentationString.AsSpan()); + _sectionWriter.WriteByte(0); // null-terminator _sectionWriter.WriteULEB128(cie.CodeAlignFactor); _sectionWriter.WriteSLEB128(cie.DataAlignFactor); diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs index aae7ccddd7e5f..3882798c70239 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ArrayOfEmbeddedPointersNode.cs @@ -126,7 +126,7 @@ public EmbeddedPointerIndirectionWithSymbolNode(ArrayOfEmbeddedPointersNode this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedManagedResourcesNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedManagedResourcesNode.cs index 408904cdd162f..8e015d97178e3 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedManagedResourcesNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedManagedResourcesNode.cs @@ -31,7 +31,7 @@ public CopiedManagedResourcesNode(EcmaModule module) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ManagedResources"); + sb.Append("__ManagedResources"u8); } protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMetadataBlobNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMetadataBlobNode.cs index 119f6b2e6e9f8..913ed4ab9e340 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMetadataBlobNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMetadataBlobNode.cs @@ -148,7 +148,7 @@ public unsafe override ObjectData GetData(NodeFactory factory, bool relocsOnly = public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__MetadataBlob"); + sb.Append("__MetadataBlob"u8); } public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMethodILNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMethodILNode.cs index b0bad75e052b0..2b1ad266ae876 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMethodILNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedMethodILNode.cs @@ -33,7 +33,7 @@ public CopiedMethodILNode(EcmaMethod method) protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("ILMethod_"); + sb.Append("ILMethod_"u8); sb.Append(nameMangler.GetMangledMethodName(_method)); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedStrongNameSignatureNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedStrongNameSignatureNode.cs index fea66066ad2a3..dd5b03b87dba5 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedStrongNameSignatureNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/CopiedStrongNameSignatureNode.cs @@ -34,7 +34,7 @@ public CopiedStrongNameSignatureNode(EcmaModule module) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__StrongNameSignature"); + sb.Append("__StrongNameSignature"u8); } protected override string GetName(NodeFactory factory) => this.GetMangledName(factory.NameMangler); diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DebugInfoTableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DebugInfoTableNode.cs index 58b1f9adc8a9d..6b4231b16c99f 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DebugInfoTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DebugInfoTableNode.cs @@ -66,7 +66,7 @@ public class DebugInfoTableNode : HeaderTableNode public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunDebugInfoTable"); + sb.Append("__ReadyToRunDebugInfoTable"u8); } public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelayLoadHelperImport.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelayLoadHelperImport.cs index 3925eca4667ca..54a85ff42e2cc 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelayLoadHelperImport.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelayLoadHelperImport.cs @@ -39,21 +39,21 @@ public DelayLoadHelperImport( public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("DelayLoadHelperImport("); + sb.Append("DelayLoadHelperImport("u8); if (_useVirtualCall) { - sb.Append("[VSD] "); + sb.Append("[VSD] "u8); } if (_useJumpableStub) { - sb.Append("[JMP] "); + sb.Append("[JMP] "u8); } sb.Append(_helper.ToString()); - sb.Append(") -> "); + sb.Append(") -> "u8); ImportSignature.AppendMangledName(nameMangler, sb); if (CallingMethod != null) { - sb.Append(" @ "); + sb.Append(" @ "u8); sb.Append(nameMangler.GetMangledMethodName(CallingMethod)); } } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelegateCtorSignature.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelegateCtorSignature.cs index 66dbf743a7089..8771ce9809056 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelegateCtorSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/DelegateCtorSignature.cs @@ -78,11 +78,11 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde sb.Append(nameMangler.CompilationUnitPrefix); sb.Append($@"DelegateCtor("); sb.Append(nameMangler.GetMangledTypeName(_delegateType)); - sb.Append(" -> "); + sb.Append(" -> "u8); _targetMethod.AppendMangledName(nameMangler, sb); - sb.Append("; "); + sb.Append("; "u8); sb.Append(_methodToken.ToString()); - sb.Append(")"); + sb.Append(")"u8); } public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ExceptionInfoLookupTableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ExceptionInfoLookupTableNode.cs index 899a9f1357aa4..f9fe3657851a1 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ExceptionInfoLookupTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ExceptionInfoLookupTableNode.cs @@ -43,7 +43,7 @@ public int AddEHInfo(byte[] ehInfo) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { // EH info node is a singleton in the R2R PE file - sb.Append("EHInfoNode"); + sb.Append("EHInfoNode"u8); } public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) @@ -77,7 +77,7 @@ public ExceptionInfoLookupTableNode(NodeFactory nodeFactory) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunExceptionInfoLookupTable@"); + sb.Append("__ReadyToRunExceptionInfoLookupTable@"u8); sb.Append(Offset.ToString()); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapNode.cs index 1e54ff3117874..7cab71737766d 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GCRefMapNode.cs @@ -44,7 +44,7 @@ public void AddImport(Import import) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("GCRefMap->"); + sb.Append("GCRefMap->"u8); sb.Append(_importSection.Name); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GenericLookupSignature.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GenericLookupSignature.cs index 05287235097ad..a50daa232ff56 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GenericLookupSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/GenericLookupSignature.cs @@ -143,28 +143,28 @@ protected override DependencyList ComputeNonRelocationBasedDependencies(NodeFact public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("GenericLookupSignature("); + sb.Append("GenericLookupSignature("u8); sb.Append(_runtimeLookupKind.ToString()); - sb.Append(" / "); + sb.Append(" / "u8); sb.Append(_fixupKind.ToString()); - sb.Append(": "); + sb.Append(": "u8); if (_methodArgument != null) { sb.Append(nameMangler.GetMangledTypeName(_methodArgument.OwningType)); - sb.Append("::"); + sb.Append("::"u8); sb.Append(nameMangler.GetMangledMethodName(_methodArgument.Method)); if (_methodArgument.ConstrainedType != null) { - sb.Append("@"); + sb.Append("@"u8); sb.Append(nameMangler.GetMangledTypeName(_methodArgument.ConstrainedType)); } if (!_methodArgument.Token.IsNull) { - sb.Append(" ["); + sb.Append(" ["u8); sb.Append(_methodArgument.Token.MetadataReader.GetString(_methodArgument.Token.MetadataReader.GetAssemblyDefinition().Name)); - sb.Append(":"); + sb.Append(":"u8); sb.Append(((uint)_methodArgument.Token.Token).ToString("X8")); - sb.Append("]"); + sb.Append("]"u8); } } if (_typeArgument != null) @@ -175,9 +175,9 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde { _fieldArgument.AppendMangledName(nameMangler, sb); } - sb.Append(" ("); + sb.Append(" ("u8); _methodContext.AppendMangledName(nameMangler, sb); - sb.Append(")"); + sb.Append(")"u8); } public override int CompareToImpl(ISortableNode other, CompilerComparer comparer) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HeaderNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HeaderNode.cs index 37406d6eafc71..b652563a9583d 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HeaderNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HeaderNode.cs @@ -220,7 +220,7 @@ public GlobalHeaderNode(ReadyToRunFlags flags, EcmaModule moduleToCheckForSkipVa protected override void AppendMangledHeaderName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunHeader"); + sb.Append("__ReadyToRunHeader"u8); } protected override void EmitHeaderPrefix(ref ObjectDataBuilder builder) @@ -258,7 +258,7 @@ public override int CompareToImpl(ISortableNode other, CompilerComparer comparer protected override void AppendMangledHeaderName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunAssemblyHeader__"); + sb.Append("__ReadyToRunAssemblyHeader__"u8); sb.Append(_index.ToString()); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HotColdMapNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HotColdMapNode.cs index 18f0177e4b936..35f17727843e1 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HotColdMapNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/HotColdMapNode.cs @@ -27,7 +27,7 @@ public uint[] Mapping public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__HotColdMap"); + sb.Append("__HotColdMap"u8); } public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Import.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Import.cs index 3a5eb9fb66441..ec5b710d3748a 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Import.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Import.cs @@ -54,7 +54,7 @@ public override void EncodeData(ref ObjectDataBuilder dataBuilder, NodeFactory f public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(Table.Name); - sb.Append("->"); + sb.Append("->"u8); ImportSignature.AppendMangledName(nameMangler, sb); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ImportThunk.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ImportThunk.cs index 3895244c00197..25a381cf0b80c 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ImportThunk.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ImportThunk.cs @@ -64,7 +64,7 @@ public ImportThunk(NodeFactory factory, ReadyToRunHelper helperId, ImportSection public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("DelayLoadHelper->"); + sb.Append("DelayLoadHelper->"u8); _helperCell.AppendMangledName(nameMangler, sb); sb.Append($"(ImportSection:{_containingImportSection.Name},Kind:{_thunkKind})"); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstanceEntryPointTableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstanceEntryPointTableNode.cs index 99fd74b930e60..1ad75093fadac 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstanceEntryPointTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstanceEntryPointTableNode.cs @@ -47,7 +47,7 @@ public void MaterializeSignature() public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunInstanceEntryPointTable"); + sb.Append("__ReadyToRunInstanceEntryPointTable"u8); } public static byte[] BuildSignatureForMethodDefinedInModule(MethodDesc method, NodeFactory factory) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstrumentationDataTableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstrumentationDataTableNode.cs index 8938b11a862b5..58ccf8969f7a0 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstrumentationDataTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/InstrumentationDataTableNode.cs @@ -180,7 +180,7 @@ private int MethodToInt(TypeSystemEntityOrUnknown handle) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunInstrumentationDataTable"); + sb.Append("__ReadyToRunInstrumentationDataTable"u8); } // Register some MDs that had synthesized PGO data created to be physically embedded by this node, and add diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestAssemblyMvidHeaderNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestAssemblyMvidHeaderNode.cs index 02a60b28c0d15..cfed82c312687 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestAssemblyMvidHeaderNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestAssemblyMvidHeaderNode.cs @@ -38,7 +38,7 @@ public ManifestAssemblyMvidHeaderNode(ManifestMetadataTableNode manifestNode) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ManifestAssemblyMvids"); + sb.Append("__ManifestAssemblyMvids"u8); } protected override string GetName(NodeFactory nodeFactory) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestMetadataTableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestMetadataTableNode.cs index 4a8e3008412ad..a021c4c83fd93 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestMetadataTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ManifestMetadataTableNode.cs @@ -264,7 +264,7 @@ private int ModuleToIndexInternal(IEcmaModule module) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("ManifestMetadataTableNode"); + sb.Append("ManifestMetadataTableNode"u8); } private void ComputeLastSetOfModuleIndices() diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodFixupSignature.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodFixupSignature.cs index 63bd0205f1f2c..e6a761d9dd7e1 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodFixupSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodFixupSignature.cs @@ -152,9 +152,9 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde sb.Append(_fixupKind.ToString()); if (IsInstantiatingStub) { - sb.Append(" [INST]"); + sb.Append(" [INST]"u8); } - sb.Append(": "); + sb.Append(": "u8); _method.AppendMangledName(nameMangler, sb); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodGCInfoNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodGCInfoNode.cs index 095387bf52fb9..d1850387c1344 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodGCInfoNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodGCInfoNode.cs @@ -24,7 +24,7 @@ public MethodGCInfoNode(MethodWithGCInfo methodNode) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("MethodGCInfoNode->"); + sb.Append("MethodGCInfoNode->"u8); _methodNode.AppendMangledName(nameMangler, sb); } @@ -278,7 +278,7 @@ public override void EncodeData(ref ObjectDataBuilder dataBuilder, NodeFactory f protected override string GetName(NodeFactory context) { Utf8StringBuilder sb = new Utf8StringBuilder(); - sb.Append("MethodGCInfo->"); + sb.Append("MethodGCInfo->"u8); _methodNode.AppendMangledName(context.NameMangler, sb); return sb.ToString(); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodWithGCInfo.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodWithGCInfo.cs index f842f5524eadb..2d13944555485 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodWithGCInfo.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/MethodWithGCInfo.cs @@ -292,9 +292,9 @@ public virtual void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder protected override string GetName(NodeFactory factory) { Utf8StringBuilder sb = new Utf8StringBuilder(); - sb.Append("MethodWithGCInfo("); + sb.Append("MethodWithGCInfo("u8); AppendMangledName(factory.NameMangler, sb); - sb.Append(")"); + sb.Append(")"u8); return sb.ToString(); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/OwnerCompositeExecutableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/OwnerCompositeExecutableNode.cs index cdcd81f0fdd7f..78831fb944537 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/OwnerCompositeExecutableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/OwnerCompositeExecutableNode.cs @@ -29,7 +29,7 @@ public OwnerCompositeExecutableNode(string ownerExecutableName) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("__ReadyToRunHeader_OwnerCompositeExecutable"); + sb.Append("__ReadyToRunHeader_OwnerCompositeExecutable"u8); } public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/PrecodeMethodImport.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/PrecodeMethodImport.cs index 8d1d84d3e4453..7af2c99e1825c 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/PrecodeMethodImport.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/PrecodeMethodImport.cs @@ -41,7 +41,7 @@ public PrecodeMethodImport( public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("PrecodeMethodImport -> "); + sb.Append("PrecodeMethodImport -> "u8); base.AppendMangledName(nameMangler, sb); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunHelperSignature.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunHelperSignature.cs index a2e4dffb97d4b..e42a112ee2015 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunHelperSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunHelperSignature.cs @@ -33,7 +33,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("ReadyToRunHelper_"); + sb.Append("ReadyToRunHelper_"u8); sb.Append(_helperID.ToString()); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs index bcb2949ee2116..44b0000d91df3 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/ReadyToRunInstructionSetSupportSignature.cs @@ -107,7 +107,7 @@ public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("ReadyToRunInstructionSets_"); + sb.Append("ReadyToRunInstructionSets_"u8); sb.Append(_instructionSetsSupport); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/RuntimeFunctionsTableNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/RuntimeFunctionsTableNode.cs index d25829f7acdaa..7c2b07e338f94 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/RuntimeFunctionsTableNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/RuntimeFunctionsTableNode.cs @@ -26,7 +26,7 @@ public RuntimeFunctionsTableNode(NodeFactory nodeFactory) public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.CompilationUnitPrefix); - sb.Append("__ReadyToRunRuntimeFunctionsTable"); + sb.Append("__ReadyToRunRuntimeFunctionsTable"u8); } public int GetIndex(MethodWithGCInfo method) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/SignatureEmbeddedPointerIndirectionNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/SignatureEmbeddedPointerIndirectionNode.cs index 0028ba58d3b03..bf02034ec7640 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/SignatureEmbeddedPointerIndirectionNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/SignatureEmbeddedPointerIndirectionNode.cs @@ -35,11 +35,11 @@ public override void EncodeData(ref ObjectDataBuilder dataBuilder, NodeFactory f public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("SignaturePointer_"); + sb.Append("SignaturePointer_"u8); Target.AppendMangledName(nameMangler, sb); if (_import.CallingMethod != null) { - sb.Append(" @ "); + sb.Append(" @ "u8); sb.Append(nameMangler.GetMangledMethodName(_import.CallingMethod)); } } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/VirtualResolutionFixupSignature.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/VirtualResolutionFixupSignature.cs index 0c2588b2e1de1..e3f1cef834f64 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/VirtualResolutionFixupSignature.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/VirtualResolutionFixupSignature.cs @@ -63,11 +63,11 @@ public override void AppendMangledName(NameMangler nameMangler, Utf8StringBuilde sb.Append(nameMangler.CompilationUnitPrefix); sb.Append($@"VirtualResolutionFixupSignature({_fixupKind.ToString()}): "); _declMethod.AppendMangledName(nameMangler, sb); - sb.Append(":"); + sb.Append(":"u8); sb.Append(nameMangler.GetMangledTypeName(_implType)); - sb.Append(":"); + sb.Append(":"u8); if (_implMethod == null) - sb.Append("(null)"); + sb.Append("(null)"u8); else _implMethod.AppendMangledName(nameMangler, sb); } diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Win32ResourcesNode.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Win32ResourcesNode.cs index c5769b515a6bd..b062478a78603 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Win32ResourcesNode.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/Compiler/DependencyAnalysis/ReadyToRun/Win32ResourcesNode.cs @@ -33,7 +33,7 @@ public Win32ResourcesNode(ResourceData resourceData) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { - sb.Append("____Win32Resources"); + sb.Append("____Win32Resources"u8); } public override ObjectData GetData(NodeFactory factory, bool relocsOnly = false) diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs index 8e3eb3a3d9257..f9bf544f8fefe 100644 --- a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs +++ b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs @@ -96,7 +96,7 @@ public bool Equals(FieldWithToken fieldWithToken) public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) { sb.Append(nameMangler.GetMangledFieldName(Field)); - sb.Append("; "); + sb.Append("; "u8); sb.Append(Token.ToString()); } @@ -336,19 +336,19 @@ public void AppendMangledName(NameMangler nameMangler, Utf8StringBuilder sb) sb.Append(nameMangler.GetMangledMethodName(Method)); if (ConstrainedType != null) { - sb.Append(" @ "); + sb.Append(" @ "u8); sb.Append(nameMangler.GetMangledTypeName(ConstrainedType)); } - sb.Append("; "); + sb.Append("; "u8); sb.Append(Token.ToString()); if (OwningTypeNotDerivedFromToken) { - sb.Append("; OWNINGTYPE"); + sb.Append("; OWNINGTYPE"u8); sb.Append(nameMangler.GetMangledTypeName(OwningType)); - sb.Append("; "); + sb.Append("; "u8); } if (Unboxing) - sb.Append("; UNBOXING"); + sb.Append("; UNBOXING"u8); } public override string ToString()