diff options
| author | 2016-08-31 15:25:25 +0100 | |
|---|---|---|
| committer | 2016-08-31 16:53:30 +0100 | |
| commit | f04cf5470fd53d93f7ae5b07205284c19fa59f41 (patch) | |
| tree | 2eeb90611ef858fb542ec475c2d8cbb1ee719d8f /compiler/optimizing | |
| parent | 081e7a16c4fcbdb014441a236e12f58eb89ff99a (diff) | |
Remove workarounds for [D]CHECK()s in constexpr functions.
We're now using C++14, so we can use [D]CHECK()s directly
in constexpr functions. Remove the C++11 workaround macros
([D]CHECK_CONSTEXPR) and C++ version checks. Also remove the
'static' qualifier from inline functions in affected files.
Test: m test-art-host
Change-Id: I0f962ad75e4efe9b65325d022cd272b229574222
Diffstat (limited to 'compiler/optimizing')
| -rw-r--r-- | compiler/optimizing/code_generator_arm.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/optimizing/code_generator_arm.h b/compiler/optimizing/code_generator_arm.h index a07dd6b5ef..ac10e2364a 100644 --- a/compiler/optimizing/code_generator_arm.h +++ b/compiler/optimizing/code_generator_arm.h @@ -63,9 +63,9 @@ class InvokeRuntimeCallingConvention : public CallingConvention<Register, SRegis DISALLOW_COPY_AND_ASSIGN(InvokeRuntimeCallingConvention); }; -static constexpr DRegister FromLowSToD(SRegister reg) { - return DCHECK_CONSTEXPR(reg % 2 == 0, , D0) - static_cast<DRegister>(reg / 2); +constexpr DRegister FromLowSToD(SRegister reg) { + DCHECK_EQ(reg % 2, 0); + return static_cast<DRegister>(reg / 2); } |