Merge pull request #3481 from MicrosoftDocs/FromPublicMasterBranch

Confirm merge from FromPublicMasterBranch to master to sync with https://github.com/MicrosoftDocs/cpp-docs (branch master)

Author: PRMerger12

docs/build/arm-exception-handling.md

@@ -188,29 +188,32 @@ When the packed unwind format is insufficient to describe the unwinding of a fun
 The `.xdata` record is designed so that it is possible to fetch the first 8 bytes and compute the full size of the record, not including the length of the variable-sized exception data that follows. This code snippet computes the record size:
 
 ```cpp
-ULONG Comput`.xdata`Size(PULONG `.xdata`)
+ULONG ComputeXdataSize(PULONG Xdata)
 {
-    ULONG EpilogueScopes;
     ULONG Size;
+    ULONG EpilogueScopes;
     ULONG UnwindWords;
 
-    if (`.xdata`[0] >> 23) != 0) {
+    if ((Xdata[0] >> 23) != 0) {
         Size = 4;
-        EpilogueScopes = `.xdata`[0] >> 23) & 0x1f;
-        UnwindWords = `.xdata`[0] >> 28) & 0x0f;
+        EpilogueScopes = (Xdata[0] >> 23) & 0x1f;
+        UnwindWords = (Xdata[0] >> 28) & 0x0f;
     } else {
         Size = 8;
-        EpilogueScopes =`.xdata`[1] & 0xffff;
-        UnwindWords = `.xdata`[1] >> 16) & 0xff;
+        EpilogueScopes = Xdata[1] & 0xffff;
+        UnwindWords = (Xdata[1] >> 16) & 0xff;
     }
 
-    if (!`.xdata`[0] & (1 << 21))) {
+    if (!(Xdata[0] & (1 << 21))) {
         Size += 4 * EpilogueScopes;
     }
+
     Size += 4 * UnwindWords;
-    if `.xdata`[0] & (1 << 20)) {
-        Size += 4;
+
+    if (Xdata[0] & (1 << 20)) {
+        Size += 4;  // Exception handler RVA
     }
+
     return Size;
 }
 ```

docs/build/arm64-exception-handling.md

@@ -237,27 +237,32 @@ This data is broken into four sections:
 The .xdata record is designed so it's possible to fetch the first 8 bytes, and use them to compute the full size of the record, minus the length of the variable-sized exception data that follows. The following code snippet computes the record size:
 
 ```cpp
-ULONG ComputeXdataSize(PULONG *Xdata)
+ULONG ComputeXdataSize(PULONG Xdata)
 {
-    ULONG EpilogScopes;
     ULONG Size;
+    ULONG EpilogScopes;
     ULONG UnwindWords;
 
-    if ((Xdata[0] >> 27) != 0) {
+    if ((Xdata[0] >> 22) != 0) {
         Size = 4;
         EpilogScopes = (Xdata[0] >> 22) & 0x1f;
-        UnwindWords = (Xdata[0] >> 27) & 0x0f;
+        UnwindWords = (Xdata[0] >> 27) & 0x1f;
     } else {
         Size = 8;
         EpilogScopes = Xdata[1] & 0xffff;
         UnwindWords = (Xdata[1] >> 16) & 0xff;
     }
 
-    Size += 4 * EpilogScopes;
+    if (!(Xdata[0] & (1 << 21))) {
+        Size += 4 * EpilogScopes;
+    }
+
     Size += 4 * UnwindWords;
+
     if (Xdata[0] & (1 << 20)) {
-        Size += 4;        // exception handler RVA
+        Size += 4;  // Exception handler RVA
     }
+
     return Size;
 }
 ```