diff options
Diffstat (limited to 'compiler/optimizing/nodes.cc')
| -rw-r--r-- | compiler/optimizing/nodes.cc | 14 | 
1 files changed, 8 insertions, 6 deletions
diff --git a/compiler/optimizing/nodes.cc b/compiler/optimizing/nodes.cc index f6ba19f22a..d3212cbbc0 100644 --- a/compiler/optimizing/nodes.cc +++ b/compiler/optimizing/nodes.cc @@ -2891,6 +2891,8 @@ std::ostream& operator<<(std::ostream& os, HInvokeStaticOrDirect::MethodLoadKind        return os << "BootImageLinkTimePcRelative";      case HInvokeStaticOrDirect::MethodLoadKind::kDirectAddress:        return os << "DirectAddress"; +    case HInvokeStaticOrDirect::MethodLoadKind::kBootImageRelRo: +      return os << "BootImageRelRo";      case HInvokeStaticOrDirect::MethodLoadKind::kBssEntry:        return os << "BssEntry";      case HInvokeStaticOrDirect::MethodLoadKind::kRuntimeCall: @@ -2925,7 +2927,7 @@ bool HLoadClass::InstructionDataEquals(const HInstruction* other) const {    }    switch (GetLoadKind()) {      case LoadKind::kBootImageAddress: -    case LoadKind::kBootImageClassTable: +    case LoadKind::kBootImageRelRo:      case LoadKind::kJitTableAddress: {        ScopedObjectAccess soa(Thread::Current());        return GetClass().Get() == other_load_class->GetClass().Get(); @@ -2944,8 +2946,8 @@ std::ostream& operator<<(std::ostream& os, HLoadClass::LoadKind rhs) {        return os << "BootImageLinkTimePcRelative";      case HLoadClass::LoadKind::kBootImageAddress:        return os << "BootImageAddress"; -    case HLoadClass::LoadKind::kBootImageClassTable: -      return os << "BootImageClassTable"; +    case HLoadClass::LoadKind::kBootImageRelRo: +      return os << "BootImageRelRo";      case HLoadClass::LoadKind::kBssEntry:        return os << "BssEntry";      case HLoadClass::LoadKind::kJitTableAddress: @@ -2968,7 +2970,7 @@ bool HLoadString::InstructionDataEquals(const HInstruction* other) const {    }    switch (GetLoadKind()) {      case LoadKind::kBootImageAddress: -    case LoadKind::kBootImageInternTable: +    case LoadKind::kBootImageRelRo:      case LoadKind::kJitTableAddress: {        ScopedObjectAccess soa(Thread::Current());        return GetString().Get() == other_load_string->GetString().Get(); @@ -2984,8 +2986,8 @@ std::ostream& operator<<(std::ostream& os, HLoadString::LoadKind rhs) {        return os << "BootImageLinkTimePcRelative";      case HLoadString::LoadKind::kBootImageAddress:        return os << "BootImageAddress"; -    case HLoadString::LoadKind::kBootImageInternTable: -      return os << "BootImageInternTable"; +    case HLoadString::LoadKind::kBootImageRelRo: +      return os << "BootImageRelRo";      case HLoadString::LoadKind::kBssEntry:        return os << "BssEntry";      case HLoadString::LoadKind::kJitTableAddress:  |