From 4b882395331e402a8b47e0570fc32a3b9007c285 Mon Sep 17 00:00:00 2001 From: Clemens Hammacher Date: Wed, 11 Apr 2018 08:49:20 +0000 Subject: [PATCH] Revert "[CFI] Refactor test use to use GeneratedCode" This reverts commit e5a687be00fc26f69c7acd96684dca826ad544c0. Reason for revert: Crashes on GCC: https://build.chromium.org/p/client.v8/builders/V8%20Linux%20gcc%204.8/builds/19002 Original change's description: > [CFI] Refactor test use to use GeneratedCode > > Replace direct call to generated code with call using GeneratedCode to > match the rest of v8. > > BUG=v8:7164 > > Change-Id: I3e45d3e7c45f06fc362a22217ee7f0f1b70745e2 > Reviewed-on: https://chromium-review.googlesource.com/1002534 > Commit-Queue: Clemens Hammacher > Reviewed-by: Clemens Hammacher > Cr-Commit-Position: refs/heads/master@{#52536} TBR=clemensh@chromium.org,vtsyrklevich@chromium.org Change-Id: I684a93d20f104244e2b74ab79ddc7d6e3a1ecf3c No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: v8:7164 Reviewed-on: https://chromium-review.googlesource.com/1006614 Reviewed-by: Clemens Hammacher Commit-Queue: Clemens Hammacher Cr-Commit-Position: refs/heads/master@{#52538} --- test/cctest/test-code-stubs.cc | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/test/cctest/test-code-stubs.cc b/test/cctest/test-code-stubs.cc index 1fb3c50ec0..6cfccd2a1f 100644 --- a/test/cctest/test-code-stubs.cc +++ b/test/cctest/test-code-stubs.cc @@ -37,7 +37,6 @@ #include "src/heap/factory.h" #include "src/macro-assembler.h" #include "src/objects-inl.h" -#include "src/simulator.h" #include "test/cctest/cctest.h" #include "test/cctest/test-code-stubs.h" @@ -98,17 +97,7 @@ void RunOneTruncationTestWithTest(ConvertDToICallWrapper callWrapper, int32_t DefaultCallWrapper(ConvertDToIFunc func, double from) { - if (func == &ConvertDToICVersion) return (*func)(from); - -#ifdef USE_SIMULATOR - // Simulator users will require a custom 'RunGeneratedCodeCallWrapper' to - // account for platform-specific floating point calling conventions. - UNREACHABLE(); -#else - auto f = - GeneratedCode::FromAddress(CcTest::i_isolate(), func); - return f.Call(from); -#endif + return (*func)(from); }