Commit f0693ac6 authored by Zhi An Ng's avatar Zhi An Ng Committed by Commit Bot

Reland "Add support for __declspec(nocf)."

This reverts commit fa9c6e17.

Reason for revert: Didn't fix the build.

Original change's description:
> Revert "Add support for __declspec(nocf)."
>
> This reverts commit 0c58583b.
>
> Reason for revert: https://crbug.com/v8/10656 and failures in https://ci.chromium.org/p/v8/builders/ci/V8%20Win64%20-%20msvc/14135
>
> Original change's description:
> > Add support for __declspec(nocf).
> >
> > __declspec(nocf) syntax was added in https://reviews.llvm.org/D72167
> > and annotates that checks should not be added on indirect calls
> > within that function.
> >
> > BUG=chromium:584575
> >
> > Change-Id: Ib2e2d2a827186a9c1fd3de15356b2b04d6a69e49
> > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2270707
> > Reviewed-by: Clemens Backes <clemensb@chromium.org>
> > Commit-Queue: Will Harris <wfh@chromium.org>
> > Cr-Commit-Position: refs/heads/master@{#68590}
>
> TBR=wfh@chromium.org,clemensb@chromium.org
>
> Change-Id: Icec64feb44715a65e905a93e0c47fb37d4f11a09
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: chromium:584575
> Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2274736
> Reviewed-by: Zhi An Ng <zhin@chromium.org>
> Commit-Queue: Zhi An Ng <zhin@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#68598}

TBR=wfh@chromium.org,clemensb@chromium.org,zhin@chromium.org

Bug: chromium:584575
Change-Id: I0e305374c8325d87e4b18963da4e90802f136187
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2274356
Commit-Queue: Zhi An Ng <zhin@chromium.org>
Reviewed-by: 's avatarZhi An Ng <zhin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#68599}
parent fa9c6e17
......@@ -176,7 +176,14 @@ V8_INLINE Dest bit_cast(Source const& source) {
// DISABLE_CFI_ICALL -- Disable Control Flow Integrity indirect call checks,
// useful because calls into JITed code can not be CFI verified.
#ifdef V8_OS_WIN
// On Windows, also needs __declspec(guard(nocf)) for CFG.
#define DISABLE_CFI_ICALL \
V8_CLANG_NO_SANITIZE("cfi-icall") \
__declspec(guard(nocf))
#else
#define DISABLE_CFI_ICALL V8_CLANG_NO_SANITIZE("cfi-icall")
#endif
#if V8_CC_GNU
#define V8_IMMEDIATE_CRASH() __builtin_trap()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment