Skip to content

Commit 25cbd91

Browse files
authored
Merge pull request #5626 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents daa42ed + bf7cc8b commit 25cbd91

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

docs/build/reference/largeaddressaware-handle-large-addresses.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
2-
description: "Learn more about: /LARGEADDRESSAWARE (Handle Large Addresses)"
32
title: "/LARGEADDRESSAWARE (Handle Large Addresses)"
3+
description: "Learn more about: /LARGEADDRESSAWARE (Handle Large Addresses)"
44
ms.date: "02/12/2024"
55
f1_keywords: ["VC.Project.VCLinkerTool.LargeAddressAware", "/largeaddressaware"]
66
helpviewer_keywords: ["LARGEADDRESSAWARE linker option", "-LARGEADDRESSAWARE linker option", "/LARGEADDRESSAWARE linker option"]
@@ -17,7 +17,7 @@ The /LARGEADDRESSAWARE option tells the linker that the application can handle a
1717

1818
If an application was linked with `/LARGEADDRESSAWARE`, `DUMPBIN` [/HEADERS](headers.md) will display information to that effect.
1919

20-
Linking 64-bit applications with **`/LARGEADDRESSAWARE:NO`** is not recommended because it restricts the available address space, which can result in runtime failures if the app exhausts memory. It may also prevent x64 apps from running on ARM64 systems because the emulation runtime will try to reserve 4GB of virtual address space. If the app was linked with `/LARGEADRESSAWARE:NO`, the app won't launch because it can't allocate that much address space.
20+
Linking 64-bit applications with **`/LARGEADDRESSAWARE:NO`** is not recommended because it restricts the available address space, which can result in runtime failures if the app exhausts memory. It may also prevent x64 apps from running on ARM64 systems because the emulation runtime will try to reserve 4GB of virtual address space. If the app was linked with `/LARGEADDRESSAWARE:NO`, the app won't launch because it can't allocate that much address space.
2121

2222
### To set this linker option in the Visual Studio development environment
2323

@@ -33,5 +33,5 @@ Linking 64-bit applications with **`/LARGEADDRESSAWARE:NO`** is not recommended
3333

3434
## See also
3535

36-
[MSVC linker reference](linking.md)<br/>
36+
[MSVC linker reference](linking.md)\
3737
[MSVC Linker Options](linker-options.md)

docs/intrinsics/addressofreturnaddress.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
---
2-
description: "Learn more about: _AddressOfReturnAddress"
32
title: "_AddressOfReturnAddress"
3+
description: "Learn more about: _AddressOfReturnAddress"
44
ms.date: "09/02/2019"
55
f1_keywords: ["_AddressOfReturnAddress_cpp", "_AddressOfReturnAddress"]
66
helpviewer_keywords: ["_AddressOfReturnAddress intrinsic", "AddressOfReturnAddress intrinsic"]
7-
ms.assetid: c7e10b8c-445e-4236-a602-e2d90200f70a
87
---
98
# _AddressOfReturnAddress
109

@@ -41,7 +40,7 @@ This routine is only available as an intrinsic.
4140
#include <intrin.h>
4241

4342
// This function will print three values:
44-
// (1) The address retrieved from _AddressOfReturnAdress
43+
// (1) The address retrieved from _AddressOfReturnAddress
4544
// (2) The return address stored at the location returned in (1)
4645
// (3) The return address retrieved the _ReturnAddress* intrinsic
4746
// Note that (2) and (3) should be the same address.

0 commit comments

Comments
 (0)