| Index: src/arm/assembler-arm.h
|
| diff --git a/src/arm/assembler-arm.h b/src/arm/assembler-arm.h
|
| index 6b00f32526af9d7c4bb02899b2103f24e180b75c..045638e1248e477850de6915d810c4146c136b0e 100644
|
| --- a/src/arm/assembler-arm.h
|
| +++ b/src/arm/assembler-arm.h
|
| @@ -74,31 +74,10 @@ class CpuFeatures : public AllStatic {
|
| (static_cast<uint64_t>(1) << f)) != 0;
|
| }
|
|
|
| - class TryForceFeatureScope BASE_EMBEDDED {
|
| - public:
|
| - explicit TryForceFeatureScope(CpuFeature f)
|
| - : old_supported_(CpuFeatures::supported_) {
|
| - if (CanForce()) {
|
| - CpuFeatures::supported_ |= (1u << f);
|
| - }
|
| - }
|
| -
|
| - ~TryForceFeatureScope() {
|
| - if (CanForce()) {
|
| - CpuFeatures::supported_ = old_supported_;
|
| - }
|
| - }
|
| -
|
| - private:
|
| - static bool CanForce() {
|
| - // It's only safe to temporarily force support of CPU features
|
| - // when there's only a single isolate, which is guaranteed when
|
| - // the serializer is enabled.
|
| - return Serializer::enabled();
|
| - }
|
| -
|
| - const unsigned old_supported_;
|
| - };
|
| + static bool IsSafeForSnapshot(CpuFeature f) {
|
| + return (IsSupported(f) &&
|
| + (!Serializer::enabled() || !IsFoundByRuntimeProbingOnly(f)));
|
| + }
|
|
|
| private:
|
| #ifdef DEBUG
|
|
|