Swaroop Sridhar [Fri, 26 Aug 2016 20:30:07 +0000 (13:30 -0700)]
Merge pull request #6908 from swaroop-sridhar/retKind
GcInfo: Don't use slim header for methods with struct-returns
Egor Chesakov [Fri, 26 Aug 2016 19:48:32 +0000 (12:48 -0700)]
Merge pull request #6914 from echesakov/ValueNumberingAssertFix
Bug fix: fgOptimizeBranch loses bbFlags while duplicating the conditional block
Egor Chesakov [Wed, 24 Aug 2016 00:35:10 +0000 (17:35 -0700)]
fgOptimizeBranch loses bbFlags while duplicating the block #6886
1. When `fgOptimizeBranch` procedure duplicates the conditional basic block it does
not copy flags of the `bDest` block to the `bJump` block. For example, if a flag
`BBF_HAS_NEWOBJ` was set in `bDest`, but not in `bJump` when the branch optimization
is done the `bbFlags` of `bJump` will not reflect the fact that we have new object
construction in this block.
2. In `DEBUG` always check if `bbFlags` has `BBF_HAS_NEWOBJ` flag set if at least one
`GT_ALLOCOBJ` canonical node found. This helps to identify situations when compiler loses `BBF_HAS_NEWOBJ` flag.
James Ko [Fri, 26 Aug 2016 05:33:49 +0000 (01:33 -0400)]
Implement the IEquatable interfaces on IntPtr and UIntPtr (#6921)
Jan Kotas [Fri, 26 Aug 2016 01:14:28 +0000 (18:14 -0700)]
Make GetHRForException to return e.HResult on non-Windows platforms (#6929)
Fixes https://github.com/dotnet/corefx/issues/11144
Jarret Shook [Thu, 25 Aug 2016 23:22:11 +0000 (16:22 -0700)]
Merge pull request #6926 from jashook/arm32_ci_update
Incremental progress addressing #6676
jashoo [Thu, 25 Aug 2016 21:54:29 +0000 (14:54 -0700)]
Incremental progress addressing #6676
This change is based upon #6910 by sjsinju to fix the arm emulator
running out of space. It changes uses the /opt folder on the main
system drive to /mnt which has a larger local disk.
James Ko [Thu, 25 Aug 2016 22:01:02 +0000 (18:01 -0400)]
Avoid unnecessary indirection in char.ToString (#6903)
Avoid unnecessary indirection in char.ToString
Matt Mitchell [Thu, 25 Aug 2016 21:11:37 +0000 (14:11 -0700)]
Merge pull request #6923 from dotnet/revert-6910-sjsinju_devel
Revert "ARM-CI : Fix ARM Emulator vm runs out of space"
Matt Mitchell [Thu, 25 Aug 2016 21:08:59 +0000 (14:08 -0700)]
Revert "ARM-CI : Fix ARM Emulator vm runs out of space"
Sujin Kim [Thu, 25 Aug 2016 21:01:27 +0000 (06:01 +0900)]
ARM-CI : Fix ARM Emulator vm runs out of space (#6910)
Now, ARM Emulator failed by out of space on tests (6676)
To resolve, a temp folder in the job's workspace is binded to /tmp. and then 'runtest.sh' would be run by some directories binded from /tmp.
Justin Van Patten [Thu, 25 Aug 2016 18:54:11 +0000 (11:54 -0700)]
Improve perf of Encoding.GetEncoding(int) (#6907)
`Encoding.GetEncoding(int)` caches encoding instances in a `Hashtable`.
This involves locking and boxing the codepage (potentially multiple
times). For the encodings that are already cached in static fields
(e.g. UTF8, Unicode, ASCII, etc.), this is unnecessary overhead --
these instances do not need to be stored in the `Hashtable` because
they are already stored in static fields.
It turns out the only instance that would be stored in the
`Hashtable` in CoreCLR is UTF32BE. Thus, on CoreCLR, we can remove the
use of the `Hashtable` altogether, and instead store the UTF32BE
instance in a static field. This means the `Hashtable` static field,
lock object, and box allocations go away entirely on CoreCLR.
We now check for the encodings that can be cached in static fields in a
switch statement up-front. On Desktop, it then falls back to doing the
`Hashtable`-based lookup/storage, and only boxes codepage once.
Mike McLaughlin [Thu, 25 Aug 2016 16:47:52 +0000 (09:47 -0700)]
Put back Open key signing on the SOS.NETCore assembly. (#6905)
Fix failure in SOS if System.Reflection.Metadata is missing.
Stephen Toub [Thu, 25 Aug 2016 11:32:21 +0000 (07:32 -0400)]
Merge pull request #6909 from kouvel/Api
Expose constructor with argument for safe handle types instead of con…
Stephen Toub [Thu, 25 Aug 2016 11:29:39 +0000 (07:29 -0400)]
Merge pull request #6898 from benaadams/semaphore-timeout-0
Semaphoreslim, fail faster for timeout 0
Ben Adams [Wed, 24 Aug 2016 19:02:29 +0000 (20:02 +0100)]
SemaphoreSlim, fail faster for timeout 0
Koundinya Veluri [Thu, 25 Aug 2016 06:37:42 +0000 (23:37 -0700)]
Expose constructor with argument for safe handle types instead of constructor without argument
James Ko [Thu, 25 Aug 2016 05:10:46 +0000 (01:10 -0400)]
Cleanup/optimize many string.Compare overloads, part 1 (#6603)
Cleanup, optimize some String.Compare overloads
Ben Adams [Thu, 25 Aug 2016 05:08:53 +0000 (06:08 +0100)]
Remove idiv from ThreadPoolWorkQueue:Dequeue loop (#6781)
Swaroop Sridhar [Thu, 25 Aug 2016 01:53:42 +0000 (18:53 -0700)]
GcInfo: Don't use slim header for struct-returns
This checkin has two changes:
1) Add a check to ensure that methods with struct-returns are
use the fat header which encodes ReturnKind in 4 bits.
2) Fix a bug in GetReturnKind().
Gaurav Khanna [Thu, 25 Aug 2016 00:58:42 +0000 (17:58 -0700)]
Merge pull request #6883 from gkhanna79/WinArm32
Enable Windows Arm32 build
James Ko [Wed, 24 Aug 2016 23:18:39 +0000 (19:18 -0400)]
Better lazy initialization for Encoding static properties (#6890)
Better lazy initialization for Encoding static properties
Jose Perez Rodriguez [Wed, 24 Aug 2016 23:10:23 +0000 (16:10 -0700)]
Remove extra TypeForward from facade to fix ConfiguredTaskAwaiter (#6899)
Pat Gavlin [Wed, 24 Aug 2016 22:50:04 +0000 (15:50 -0700)]
Fix #3554. (#6880)
On x86, `emitter::emitInsBinary` was calling `genProduceReg` on the
`dst` tree if the source was a contained class field load and the
destination was a register. As per the comment on the offending
function, it is the caller's responsibility to call `genProduceReg`
for the destination register, if any. This was causing errors in
GC ref reporting on x86. This issue did not appear on x64 because
AFAICT we very nearly always morph class field loads into loads of
a `CNS_INT` handle (see morph.cpp:6344 in `fgMorphField` for
details).
Justin Van Patten [Wed, 24 Aug 2016 22:34:20 +0000 (15:34 -0700)]
Add single separator String.Split overloads (#895)
Michelle McDaniel [Wed, 24 Aug 2016 22:12:17 +0000 (15:12 -0700)]
Merge pull request #6859 from adiaaida/addNMakeOption
Update build to optionally configure with nmake
Michelle McDaniel [Fri, 19 Aug 2016 22:35:25 +0000 (15:35 -0700)]
Update build to optionally configure with nmake
For formatting, we want to be able to obtain the compile_commands.json
file so that we do not have to 1) do a full build of coreclr and 2)
generate it ourselves from the build log. This change modifies build.cmd
to take an option "usenmakemakefiles." This option will set
__NMakeMakefiles to 1, which is used by the gen-buildsys-win.bat script.
This option also sets all the same options as configureonly, as we cannot
do a full build using NMake Makefiles, and we only want to use this to
force CMake to generate a compile_commands.json file for the jit
directory, which it can do using NMake Makefiles, but not Visual Studio.
The update to gen-buildsys-win.bat checks the value of __NMakeMakefiles,
and if it is set to 1, it sets the CMake Generator to NMake Makefiles.
Jan Kotas [Wed, 24 Aug 2016 20:15:05 +0000 (13:15 -0700)]
Merge pull request #6896 from dotnet-bot/from-tfs
Merge changes from TFS
Jan Kotas [Wed, 24 Aug 2016 20:14:05 +0000 (13:14 -0700)]
Disabling test against issue 6553 (#6895)
Eric Mellino [Wed, 24 Aug 2016 20:13:06 +0000 (13:13 -0700)]
Allow Ubuntu 16.10 to use MSBuild (#6897)
Pat Gavlin [Wed, 24 Aug 2016 19:58:25 +0000 (12:58 -0700)]
Handle multi-reg PUTARG_STK nodes. (#6870)
* Handle multi-reg PUTARG_STK nodes.
When FEATURE_MULTIREG_ARGS is true, a GT_PUTARG_STK node may have a
GT_LIST as a child if the child was originally a multi-reg argument.
Handle this case in `GenTreeUseEdgeIterator`.
Fixes #6583.
* Update the bug number for some ARM64 failures.
These tests are now failing due to a differnt bug.
Michelle McDaniel [Wed, 24 Aug 2016 19:54:59 +0000 (12:54 -0700)]
Merge pull request #6894 from adiaaida/morphingLongCall
Remove NYI for helper calls with long return types
Gaurav Khanna [Wed, 24 Aug 2016 19:33:27 +0000 (12:33 -0700)]
Some minor changes.
Bruce Forstall [Wed, 24 Aug 2016 18:01:19 +0000 (11:01 -0700)]
Merge pull request #6887 from BruceForstall/Fix6588a
Fix local var ref counts in IND/STOREIND decomposition
Tarek Mahmoud Sayed [Wed, 24 Aug 2016 17:54:28 +0000 (10:54 -0700)]
Merge pull request #6866 from tarekgh/GlobalizationPorting1
Enable more code under globalization for netcore
Jan Kotas [Wed, 24 Aug 2016 17:44:37 +0000 (10:44 -0700)]
Fix full framework build
[tfs-changeset: 1623920]
Michelle McDaniel [Wed, 24 Aug 2016 15:38:48 +0000 (08:38 -0700)]
Remove NYI for helper calls with long return types
The LIR changes fixed the bug in the decomp and the dumper for morphing
nodes into helper calls with long return types, so this NYI can be
removed.
Rahul Kumar [Wed, 24 Aug 2016 06:32:05 +0000 (23:32 -0700)]
Merge pull request #6882 from rahku/arm64tests
ARM64: update tests.lst
Gaurav Khanna [Mon, 22 Aug 2016 16:45:43 +0000 (09:45 -0700)]
Initial commit to build Win32 Arm CoreCLR
Rama krishnan Raghupathy [Wed, 24 Aug 2016 05:18:47 +0000 (22:18 -0700)]
Merge pull request #6851 from ramarag/unifytestbuild
Changing The way Coreclr Test Builds
Bruce Forstall [Wed, 24 Aug 2016 04:37:42 +0000 (21:37 -0700)]
Merge pull request #6885 from BruceForstall/FixLIRComments
Fix DecomposeStoreInd comments
Jose Perez Rodriguez [Wed, 24 Aug 2016 03:59:36 +0000 (20:59 -0700)]
Merge pull request #6869 from joperezr/AddingTimeZone
Adding System.TimeZone
Justin Van Patten [Wed, 24 Aug 2016 03:21:45 +0000 (20:21 -0700)]
Module.Name: Avoid unnecessary char[] allocation (#6865)
Instead of `new string(s.ToCharArray(), i + 1, s.Length - i - 1)`, use
the simpler `string.Substring(i + 1)` to avoid the unnecessary
intermediate char[] allocation.
Justin Van Patten [Wed, 24 Aug 2016 03:16:22 +0000 (20:16 -0700)]
DateTimeFormat: Avoid intermediate char[] allocation (#6863)
An unnecessary intermediate char[] allocation can be avoided by calling
`new string(c, 1)` instead of `new string(new char[] { c })`.
Łukasz Domeradzki [Wed, 24 Aug 2016 02:42:55 +0000 (04:42 +0200)]
Allow to use clang 3.9 in build.sh (#6888)
Can be found e.g. in Debian Sid.
Rama Krishnan Raghupathy [Wed, 24 Aug 2016 01:31:26 +0000 (18:31 -0700)]
Infra changes to unify the tests to be built against a common project.json.
1. tests\src\Common\test_dependencies\project.json - To consume corefx and other nuget feeds
2. tests\src\Common\empty\project.json - To build against the mscorlib facade,to use this just Add
<ReferenceLocalMscorlib>true</ReferenceLocalMscorlib> to your project
Rama Krishnan Raghupathy [Wed, 24 Aug 2016 01:29:55 +0000 (18:29 -0700)]
Cosmetic changes, removing unnceseary files and entries in project files.
Unifying the way project referring mscorlib facade builds
dotnet bot [Wed, 24 Aug 2016 00:53:29 +0000 (17:53 -0700)]
Disable downloading xplat binaries as we no longer need to build these packages in razzle. (#6871)
[tfs-changeset: 1623740]
Bruce Forstall [Wed, 24 Aug 2016 00:38:30 +0000 (17:38 -0700)]
Fix local var ref counts in IND/STOREIND decomposition
When creating new references to a local variable in long decomposition,
the variable reference count must be incremented.
Fixes #6588
Bruce Forstall [Wed, 24 Aug 2016 00:10:31 +0000 (17:10 -0700)]
Fix DecomposeStoreInd comments
Rahul Kumar [Tue, 23 Aug 2016 23:58:22 +0000 (16:58 -0700)]
update tests.lst
Rama Krishnan Raghupathy [Sat, 20 Aug 2016 02:08:01 +0000 (19:08 -0700)]
Moving baseservices tests to use uber project.json
Rama Krishnan Raghupathy [Sat, 20 Aug 2016 02:03:28 +0000 (19:03 -0700)]
Bulk moving Tests to use uber project.json
Rama Krishnan Raghupathy [Sat, 20 Aug 2016 02:01:27 +0000 (19:01 -0700)]
Moving GC tests to use uber project.json
Bruce Forstall [Tue, 23 Aug 2016 23:15:44 +0000 (16:15 -0700)]
Merge pull request #6873 from BruceForstall/Fix6180
Reenable tests
Immo Landwerth [Tue, 23 Aug 2016 23:10:48 +0000 (16:10 -0700)]
Merge pull request #6878 from terrajobst/master
Add section on how to file security bugs
Tarek Mahmoud Sayed [Tue, 23 Aug 2016 18:23:19 +0000 (11:23 -0700)]
Enable more code under globalization for netcore
This fix is to enable the code handling LCID for Windows in globalization namespace
Barry Dorrans [Tue, 23 Aug 2016 22:58:44 +0000 (15:58 -0700)]
Add section on how to file security bugs
Pat Gavlin [Tue, 23 Aug 2016 22:41:09 +0000 (15:41 -0700)]
Stop maintaining costs in fgSimpleLowering. (#6872)
This was causing a few asserts on x86.
Matt Mitchell [Tue, 23 Aug 2016 22:34:40 +0000 (15:34 -0700)]
Merge pull request #6868 from mmitche/disable-node-reuse
Disable node reuse
Michelle McDaniel [Tue, 23 Aug 2016 21:34:47 +0000 (14:34 -0700)]
Merge pull request #6858 from adiaaida/fixBuildsh
Fix ConfigureOnly option in build.sh
Bruce Forstall [Tue, 23 Aug 2016 21:22:48 +0000 (14:22 -0700)]
Reenable tests
The tests disabled due to the assert in #6180 no longer fail
(possibly as a side-effect of the LIR backend changes?), so
reenable them.
Matt Mitchell [Tue, 23 Aug 2016 19:03:41 +0000 (12:03 -0700)]
Disable node reuse
Rahul Kumar [Tue, 23 Aug 2016 20:34:30 +0000 (13:34 -0700)]
Merge pull request #6815 from rahku/apicompat
Expose MulticastDelegate.GetObjectData method
dotnet bot [Tue, 23 Aug 2016 19:58:41 +0000 (12:58 -0700)]
Add missing .gitmirror file. (#6864)
[tfs-changeset: 1623730]
Jose Perez Rodriguez [Tue, 23 Aug 2016 16:31:05 +0000 (09:31 -0700)]
Adding System.TimeZone
Pat Gavlin [Tue, 23 Aug 2016 17:18:54 +0000 (10:18 -0700)]
Fix the ninja build for FC23. (#6861)
Fedora installs ninja under the name `ninja-build` rather than `ninja`.
Pat Gavlin [Tue, 23 Aug 2016 16:36:27 +0000 (09:36 -0700)]
Stop maintaining cost estimates in the RyuJIT backend. (#6849)
* Summarize HIR cost estimates on Compiler.
These cost estimates are made on HIR and are not used by the backend.
Stash them before converting the function to LIR and report them at the
end of compilation.
* Stop maintaining costs in the backend.
The backend does not use the tree cost estimates.
* Remove a bit more cost maintenance.
* Address PR feedback.
Bruce Forstall [Tue, 23 Aug 2016 16:32:42 +0000 (09:32 -0700)]
Merge pull request #6852 from BruceForstall/Disable4702
Conditionally disable C4702 "unreachable code" warnings
Michelle McDaniel [Mon, 22 Aug 2016 18:01:41 +0000 (11:01 -0700)]
Fix ConfigureOnly option in build.sh
ConfigureOnly is intended to run the CMake to configure the build, but
nothing else. However, when you passed configureonly to build.sh, it set
__SkipConfigure=1, which made it skip the configure step of the build.
This change fixes that by removing that option from the options set my
configureonly, and adds a check right after configure and right before
running the build to exit if we are only configuring.
Jose Perez Rodriguez [Tue, 23 Aug 2016 15:40:23 +0000 (08:40 -0700)]
Adding missing members on System Namespace (#6818)
Adding missing members on System Namespace
Davis Goodin [Tue, 23 Aug 2016 15:28:31 +0000 (10:28 -0500)]
Merge pull request #6664 from dagood/update-existing-pr
Use versions repo tooling from BuildTools
Bruce Forstall [Tue, 23 Aug 2016 04:52:16 +0000 (21:52 -0700)]
Merge pull request #6848 from BruceForstall/FixArm64SuperPmi2
Fix superpmi arm64 build
Bruce Forstall [Tue, 23 Aug 2016 04:44:29 +0000 (21:44 -0700)]
Merge pull request #6846 from BruceForstall/FixSuperPmiX86
Reenable superpmi test for x86
Bruce Forstall [Tue, 23 Aug 2016 00:34:44 +0000 (17:34 -0700)]
Conditionally disable C4702 "unreachable code" warnings
The CLR header file check.h, macro CHECK_MSG_EX, can create unreachable code if the LEAVE_DEBUG_ONLY_CODE
macro is not empty (such as it is defined in contract.h) and the _RESULT macro expands to "return".
Checked-in compilers used by the TFS-based desktop build (e.g., version 18.10.40116.8) started reporting
unreachable code warnings when debugholder.h was changed to no longer #define "return" to something relatively
complex. However, newer compilers, such as Visual Studio 2015, used to build the CLR from the open source
GitHub repo, still do not report this warning. We don't want to disable this warning for the open source build,
which will use a newer compiler. Hence, only disable it for older compilers.
dotnet bot [Tue, 23 Aug 2016 00:02:16 +0000 (17:02 -0700)]
Fix SOS build break from PR #6838. (#6845)
[tfs-changeset: 1623588]
Joel Hendrix [Mon, 22 Aug 2016 23:25:43 +0000 (16:25 -0700)]
Merge pull request #6847 from jhendrixMSFT/master
Use the "open" key for strong-name signing SOS.NETCore.dll.
Jonathan Miller [Mon, 22 Aug 2016 23:17:09 +0000 (16:17 -0700)]
Adding the missing string function to model.xml (#6694)
* Adding + stubbing out the missing Globalization functions
* Doing the correct native implementation now...
Matt Mitchell [Mon, 22 Aug 2016 23:16:15 +0000 (16:16 -0700)]
Merge pull request #6850 from mmitche/fix-regex
Fix regex
Matt Mitchell [Mon, 22 Aug 2016 23:14:43 +0000 (16:14 -0700)]
Fix regex
smile21prc [Mon, 22 Aug 2016 22:54:07 +0000 (15:54 -0700)]
Merge pull request #6822 from smile21prc/coreclr-perf
Automate enhancement on the perf data collection for JIT CodeQuality benchmarks on Windows.
Bruce Forstall [Mon, 22 Aug 2016 22:08:25 +0000 (15:08 -0700)]
Fix superpmi arm64 build
Joel Hendrix [Mon, 22 Aug 2016 21:51:48 +0000 (14:51 -0700)]
Use the "open" key for strong-name signing SOS.NETCore.dll.
Switch to using the OSS strong name instead of the default MSFT one.
Bruce Forstall [Mon, 22 Aug 2016 21:10:50 +0000 (14:10 -0700)]
Reenable superpmi test for x86
Replace Roslyn CscBench with Bytemark, since CscBench fails with
an inlining assert (opened as issue #6844) on x86.
Pat Gavlin [Mon, 22 Aug 2016 21:01:31 +0000 (14:01 -0700)]
Remove fgDebugCheckLinear{Tree,NodeLinks}. (#6842)
These functions are not necessary for LIR.
Davis Goodin [Mon, 8 Aug 2016 23:45:59 +0000 (18:45 -0500)]
Use versions repo tooling from BuildTools.
Sets up dependencies.props config. Removes UpdateDependencies powershell script, to be replaced by a call into VersionTools in Maestro automation. Changes UpdatePublishedVersions to pass through to VersionTools for backward compatibility.
Hannah Zhang [Mon, 22 Aug 2016 20:12:48 +0000 (13:12 -0700)]
Merge pull request #6840 from hann013/t-hazhan/SuppressIldasmAttribute
Added SuppressIldasmAttribute
Eric Mellino [Mon, 22 Aug 2016 17:29:35 +0000 (10:29 -0700)]
Merge pull request #6821 from mellinoe/opensuse421
Add a CI job for openSUSE 42.1
Hannah Zhang [Mon, 22 Aug 2016 17:24:29 +0000 (10:24 -0700)]
Added SuppressIldasmAttribute to mscorlib and model.xml
Brian Sullivan [Mon, 22 Aug 2016 14:05:34 +0000 (07:05 -0700)]
Merge pull request #6806 from wateret/fix-hfa
[ARM/Linux] Fix HFA structs
James Ko [Mon, 22 Aug 2016 02:00:19 +0000 (22:00 -0400)]
Further optimizations for String.Join, String.Concat (#6800)
* Apply length-1 optimization to Join(string, object[])
* Apply length-1 optimization to Concat(IEnumerable<string>)
* Apply length-1 optimization to Concat(IEnumerable<T>)
* Apply lengths 0/1 optimizations to Concat(object[]), Concat(string[])
Hanjoung Lee [Fri, 19 Aug 2016 07:32:00 +0000 (16:32 +0900)]
[ARM/Linux] Fix HFA structs
Re-enable FEATURE_MULTIREG_RET for ARM32 which was disabled by #6467.
Fix #6677
Bruce Forstall [Sun, 21 Aug 2016 03:51:31 +0000 (20:51 -0700)]
Merge pull request #6832 from dotnet-bot/from-tfs
Merge changes from TFS
Matt Ellis [Sun, 21 Aug 2016 01:29:38 +0000 (18:29 -0700)]
Merge remote-tracking branch 'upstream/master' into from-tfs
Bruce Forstall [Sat, 20 Aug 2016 20:27:20 +0000 (13:27 -0700)]
Disable SuperPMI unit test for x86 legacy backend
[tfs-changeset: 1623421]
Bruce Forstall [Sat, 20 Aug 2016 20:15:09 +0000 (13:15 -0700)]
SuperPMI: fix ARM build break
[tfs-changeset: 1623419]
Pat Gavlin [Sat, 20 Aug 2016 17:41:28 +0000 (10:41 -0700)]
Assert that any node with a non-zero dstCount produces a value. (#6827)
* Assert that any node with a non-zero dstCount produces a value.
The register allocator will otherwise misallocate, as such nodes will
produce an unconsumed value.
* Fix the dstCount for GT_RETFILT.
Bruce Forstall [Sat, 20 Aug 2016 17:15:38 +0000 (10:15 -0700)]
Disable superpmi test for RyuJIT/x86
[tfs-changeset: 1623413]
Bruce Forstall [Sat, 20 Aug 2016 17:07:50 +0000 (10:07 -0700)]
Fix build break related to LogException requiring non-empty varargs arguments
[tfs-changeset: 1623412]
Peter Jas [Sat, 20 Aug 2016 07:05:50 +0000 (10:05 +0300)]
Fix ARM64 build breakage (#6819)