Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Gnbrkm41 wants to merge 2 commits into from
Closed

Make System.Guid readonly #1809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46b795b
Make System.Guid readonly
Gnbrkm41 Jan 15, 2020
eab1bca
Update Unix's NewGuid for the readonly change
Gnbrkm41 Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
public partial struct Guid
public readonly partial struct Guid
{
// This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
public static unsafe Guid NewGuid()
{
Guid g;
MutableGuid g;
Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
}

return g;
return Unsafe.As<MutableGuid, Guid>(ref g);
}
}
}
88 changes: 53 additions & 35 deletions src/libraries/System.Private.CoreLib/src/System/Guid.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
[Serializable]
[NonVersionable] // This only applies to field layout
[TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
{
public static readonly Guid Empty = default;

private int _a; // Do not rename (binary serialization)
private short _b; // Do not rename (binary serialization)
private short _c; // Do not rename (binary serialization)
private byte _d; // Do not rename (binary serialization)
private byte _e; // Do not rename (binary serialization)
private byte _f; // Do not rename (binary serialization)
private byte _g; // Do not rename (binary serialization)
private byte _h; // Do not rename (binary serialization)
private byte _i; // Do not rename (binary serialization)
private byte _j; // Do not rename (binary serialization)
private byte _k; // Do not rename (binary serialization)
private readonly int _a; // Do not rename (binary serialization)
private readonly short _b; // Do not rename (binary serialization)
private readonly short _c; // Do not rename (binary serialization)
private readonly byte _d; // Do not rename (binary serialization)
private readonly byte _e; // Do not rename (binary serialization)
private readonly byte _f; // Do not rename (binary serialization)
private readonly byte _g; // Do not rename (binary serialization)
private readonly byte _h; // Do not rename (binary serialization)
private readonly byte _i; // Do not rename (binary serialization)
private readonly byte _j; // Do not rename (binary serialization)
private readonly byte _k; // Do not rename (binary serialization)

@bartonjsbartonjsJan 16, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?

@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.

@danmoseleydanmoseleyJan 16, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)

@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.


// Creates a new guid from an array of bytes.
public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
private struct GuidResult
{
private readonly GuidParseThrowStyle _throwStyle;
internal Guid _parsedGuid;
internal MutableGuid _parsedGuid;

internal GuidResult(GuidParseThrowStyle canThrow) : this()
{
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
}
}

// A struct that's identical in its structure to System.Guid.
// This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
[StructLayout(LayoutKind.Sequential)]
private struct MutableGuid
{
public int _a;
public short _b;
public short _c;
public byte _d;
public byte _e;
public byte _f;
public byte _g;
public byte _h;
public byte _i;
public byte _j;
public byte _k;
}

// Creates a new guid based on the value in the string. The value is made up
// of hex digits speared by the dash ("-"). The string may begin and end with
// brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
bool success = TryParseGuid(g, ref result);
Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

this = result._parsedGuid;
this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
}

public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
bool success = TryParseGuid(input, ref result);
Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

return result._parsedGuid;
return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
}

public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
var parseResult = new GuidResult(GuidParseThrowStyle.None);
if (TryParseGuid(input, ref parseResult))
{
result = parseResult._parsedGuid;
result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
return true;
}
else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
_ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
};
Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
return result._parsedGuid;
return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
}

public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

if (success)
{
result = parseResult._parsedGuid;
result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
return true;
}
else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
return false;
}

ref Guid g = ref result._parsedGuid;
ref MutableGuid g = ref result._parsedGuid;

uint uintTmp;
if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
return false;
}

ref Guid g = ref result._parsedGuid;
ref MutableGuid g = ref result._parsedGuid;

uint uintTmp;
if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
var g = new byte[16];
if (BitConverter.IsLittleEndian)
{
MemoryMarshal.TryWrite<Guid>(g, ref this);
MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
}
else
{
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
{
if (BitConverter.IsLittleEndian)
{
return MemoryMarshal.TryWrite(destination, ref this);
return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
}

// slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
public override int GetHashCode()
{
// Simply XOR all the bits of the GUID 32 bits at a time.
return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
}

// Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

// Now compare each of the elements
return g._a == _a &&
Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
}

public bool Equals(Guid g)
{
// Now compare each of the elements
return g._a == _a &&
Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
}

private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

public static bool operator ==(Guid a, Guid b) =>
a._a == b._a &&
Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

public static bool operator !=(Guid a, Guid b) =>
// Now compare each of the elements
a._a != b._a ||
Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

public string ToString(string? format)
{
Expand Down
4 changes: 2 additions & 2 deletions src/libraries/System.Runtime/ref/System.Runtime.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
{
public GopherStyleUriParser() { }
}
public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
{
private int _dummyPrimitive;
private readonly int _dummyPrimitive;
public static readonly System.Guid Empty;
public Guid(byte[] b) { throw null; }
public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Make System.Guid readonly#1809

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Closed

Gnbrkm41
wants to merge
2
commits into

from

 Closed


Make System.Guid readonly
#1809
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
46b795b

Make System.Guid readonly


Gnbrkm41 Jan 15, 2020
eab1bca

Update Unix's NewGuid for the readonly change


Gnbrkm41 Jan 16, 2020

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


7 changes: 4 additions & 3 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.Unix.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -4,15 +4,16 @@

using System.Diagnostics;
using System.Runtime.InteropServices;
using Internal.Runtime.CompilerServices;

namespace System
{
 public partial struct Guid
 public readonly partial struct Guid
 {
 // This will create a new random guid based on the https://www.ietf.org/rfc/rfc4122.txt
 public static unsafe Guid NewGuid()
 {
Guid g;
MutableGuid g;
 Interop.GetRandomBytes((byte*)&g, sizeof(Guid));

 const ushort VersionMask = 0xF000;
Expand All@@ -31,7 +32,7 @@ public static unsafe Guid NewGuid()
 g._d = (byte)((g._d & ~ClockSeqHiAndReservedMask) | ClockSeqHiAndReservedValue);
 }

 return g;
 return Unsafe.As<MutableGuid, Guid>(ref g);
 }
 }
}

88 changes: 53 additions & 35 deletions
src/libraries/System.Private.CoreLib/src/System/Guid.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -16,21 +16,21 @@ namespace System
 [Serializable]
 [NonVersionable] // This only applies to field layout
 [TypeForwardedFrom("mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089")]
 public partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 public readonly partial struct Guid : IFormattable, IComparable, IComparable<Guid>, IEquatable<Guid>, ISpanFormattable
 {
 public static readonly Guid Empty = default;

 private int _a; // Do not rename (binary serialization)
 private short _b; // Do not rename (binary serialization)
 private short _c; // Do not rename (binary serialization)
 private byte _d; // Do not rename (binary serialization)
 private byte _e; // Do not rename (binary serialization)
 private byte _f; // Do not rename (binary serialization)
 private byte _g; // Do not rename (binary serialization)
 private byte _h; // Do not rename (binary serialization)
 private byte _i; // Do not rename (binary serialization)
 private byte _j; // Do not rename (binary serialization)
 private byte _k; // Do not rename (binary serialization)
 private readonly int _a; // Do not rename (binary serialization)
 private readonly short _b; // Do not rename (binary serialization)
 private readonly short _c; // Do not rename (binary serialization)
 private readonly byte _d; // Do not rename (binary serialization)
 private readonly byte _e; // Do not rename (binary serialization)
 private readonly byte _f; // Do not rename (binary serialization)
 private readonly byte _g; // Do not rename (binary serialization)
 private readonly byte _h; // Do not rename (binary serialization)
 private readonly byte _i; // Do not rename (binary serialization)
 private readonly byte _j; // Do not rename (binary serialization)
 private readonly byte _k; // Do not rename (binary serialization)
@bartonjsbartonjsJan 16, 2020

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is marking the fields as readonly going to break binary serialization?
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just did a simple experiment of creating a struct with a non-readonly field, serialising it to a file, marking the field and the struct as readonly and deserialising it; It appears to work fine without exceptions. Though, I haven't really used binary serialisation so I could be wrong.
@danmoseleydanmoseleyJan 16, 2020

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please verify the reverse as well since that's also supported (although, if ->readonly works, surely <-readonly does too)
@Gnbrkm41Gnbrkm41Jan 16, 2020

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The opposite seems to be true as well.

 // Creates a new guid from an array of bytes.
 public Guid(byte[] b) :
Expand DownExpand Up@@ -135,7 +135,7 @@ private enum GuidParseThrowStyle : byte
 private struct GuidResult
 {
 private readonly GuidParseThrowStyle _throwStyle;
 internal Guid _parsedGuid;
 internal MutableGuid _parsedGuid;

 internal GuidResult(GuidParseThrowStyle canThrow) : this()
 {
Expand DownExpand Up@@ -163,6 +163,24 @@ internal void SetFailure(bool overflow, string failureMessageID)
 }
 }

 // A struct that's identical in its structure to System.Guid.
 // This is to work around not being able to mutate the fields once the type is marked readonly by reinterpret-casting.
 [StructLayout(LayoutKind.Sequential)]
 private struct MutableGuid
 {
 public int _a;
 public short _b;
 public short _c;
 public byte _d;
 public byte _e;
 public byte _f;
 public byte _g;
 public byte _h;
 public byte _i;
 public byte _j;
 public byte _k;
 }

 // Creates a new guid based on the value in the string. The value is made up
 // of hex digits speared by the dash ("-"). The string may begin and end with
 // brackets ("{", "}").
Expand All@@ -181,7 +199,7 @@ public Guid(string g)
 bool success = TryParseGuid(g, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.All means throw on all failures");

 this = result._parsedGuid;
 this = Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static Guid Parse(string input) =>
Expand All@@ -193,7 +211,7 @@ public static Guid Parse(ReadOnlySpan<char> input)
 bool success = TryParseGuid(input, ref result);
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");

 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParse(string? input, out Guid result)
Expand All@@ -212,7 +230,7 @@ public static bool TryParse(ReadOnlySpan<char> input, out Guid result)
 var parseResult = new GuidResult(GuidParseThrowStyle.None);
 if (TryParseGuid(input, ref parseResult))
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -248,7 +266,7 @@ public static Guid ParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> forma
 _ => throw new FormatException(SR.Format_InvalidGuidFormatSpecification),
 };
 Debug.Assert(success, "GuidParseThrowStyle.AllButOverflow means throw on all failures");
 return result._parsedGuid;
 return Unsafe.As<MutableGuid, Guid>(ref result._parsedGuid);
 }

 public static bool TryParseExact(string? input, string? format, out Guid result)
Expand DownExpand Up@@ -299,7 +317,7 @@ public static bool TryParseExact(ReadOnlySpan<char> input, ReadOnlySpan<char> fo

 if (success)
 {
 result = parseResult._parsedGuid;
 result = Unsafe.As<MutableGuid, Guid>(ref parseResult._parsedGuid);
 return true;
 }
 else
Expand DownExpand Up@@ -372,7 +390,7 @@ private static bool TryParseExactD(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (TryParseHex(guidString.Slice(0, 8), out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -422,7 +440,7 @@ private static bool TryParseExactN(ReadOnlySpan<char> guidString, ref GuidResult
 return false;
 }

 ref Guid g = ref result._parsedGuid;
 ref MutableGuid g = ref result._parsedGuid;

 uint uintTmp;
 if (uint.TryParse(guidString.Slice(0, 8), NumberStyles.AllowHexSpecifier, null, out Unsafe.As<int, uint>(ref g._a)) && // _a
Expand DownExpand Up@@ -732,7 +750,7 @@ public byte[] ToByteArray()
 var g = new byte[16];
 if (BitConverter.IsLittleEndian)
 {
 MemoryMarshal.TryWrite<Guid>(g, ref this);
 MemoryMarshal.TryWrite(g, ref Unsafe.AsRef(this));
 }
 else
 {
Expand All@@ -746,7 +764,7 @@ public bool TryWriteBytes(Span<byte> destination)
 {
 if (BitConverter.IsLittleEndian)
 {
 return MemoryMarshal.TryWrite(destination, ref this);
 return MemoryMarshal.TryWrite(destination, ref Unsafe.AsRef(this));
 }

 // slower path for BigEndian
Expand DownExpand Up@@ -778,7 +796,7 @@ public bool TryWriteBytes(Span<byte> destination)
 public override int GetHashCode()
 {
 // Simply XOR all the bits of the GUID 32 bits at a time.
 return _a ^ Unsafe.Add(ref _a, 1) ^ Unsafe.Add(ref _a, 2) ^ Unsafe.Add(ref _a, 3);
 return _a ^ Unsafe.Add(ref Unsafe.AsRef(_a), 1) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 2) ^ Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 // Returns true if and only if the guid represented
Expand All@@ -793,18 +811,18 @@ public override bool Equals(object? o)

 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 public bool Equals(Guid g)
 {
 // Now compare each of the elements
 return g._a == _a &&
 Unsafe.Add(ref g._a, 1) == Unsafe.Add(ref _a, 1) &&
 Unsafe.Add(ref g._a, 2) == Unsafe.Add(ref _a, 2) &&
 Unsafe.Add(ref g._a, 3) == Unsafe.Add(ref _a, 3);
 Unsafe.Add(ref Unsafe.AsRef(g._a), 1) == Unsafe.Add(ref Unsafe.AsRef(_a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 2) == Unsafe.Add(ref Unsafe.AsRef(_a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(g._a), 3) == Unsafe.Add(ref Unsafe.AsRef(_a), 3);
 }

 private int GetResult(uint me, uint them) => me < them ? -1 : 1;
Expand DownExpand Up@@ -941,16 +959,16 @@ public int CompareTo(Guid value)

 public static bool operator ==(Guid a, Guid b) =>
 a._a == b._a &&
 Unsafe.Add(ref a._a, 1) == Unsafe.Add(ref b._a, 1) &&
 Unsafe.Add(ref a._a, 2) == Unsafe.Add(ref b._a, 2) &&
 Unsafe.Add(ref a._a, 3) == Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) == Unsafe.Add(ref Unsafe.AsRef(b._a), 1) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) == Unsafe.Add(ref Unsafe.AsRef(b._a), 2) &&
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) == Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public static bool operator !=(Guid a, Guid b) =>
 // Now compare each of the elements
 a._a != b._a ||
 Unsafe.Add(ref a._a, 1) != Unsafe.Add(ref b._a, 1) ||
 Unsafe.Add(ref a._a, 2) != Unsafe.Add(ref b._a, 2) ||
 Unsafe.Add(ref a._a, 3) != Unsafe.Add(ref b._a, 3);
 Unsafe.Add(ref Unsafe.AsRef(a._a), 1) != Unsafe.Add(ref Unsafe.AsRef(b._a), 1) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 2) != Unsafe.Add(ref Unsafe.AsRef(b._a), 2) ||
 Unsafe.Add(ref Unsafe.AsRef(a._a), 3) != Unsafe.Add(ref Unsafe.AsRef(b._a), 3);

 public string ToString(string? format)
 {
Expand Down

4 changes: 2 additions & 2 deletions
src/libraries/System.Runtime/ref/System.Runtime.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1341,9 +1341,9 @@ public partial class GopherStyleUriParser : System.UriParser
 {
 public GopherStyleUriParser() { }
 }
 public partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 public readonly partial struct Guid : System.IComparable, System.IComparable<System.Guid>, System.IEquatable<System.Guid>, System.IFormattable
 {
 private int _dummyPrimitive;
 private readonly int _dummyPrimitive;
 public static readonly System.Guid Empty;
 public Guid(byte[] b) { throw null; }
 public Guid(int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) { throw null; }
Expand Down