summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Narayan Kamath <narayan@google.com> 2016-11-02 13:03:28 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-11-02 13:03:28 +0000
commitc65310326ea87008776bd64ed3bb530d8da644c3 (patch)
tree4e65947d1d0c8fa472d5996f21f8a15b8aed45b8
parenta4af47ebf5aa8ee0e7f55b96b139f1c97bab1d55 (diff)
parent3d74bf45706429f0cbfce0c1e7d213416c5ecf50 (diff)
Merge "Revert accidental change introduced in 000e188570."
-rw-r--r--runtime/runtime.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 86464abe0d..77ec23812a 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -316,8 +316,7 @@ class Runtime {
}
bool IsMethodHandlesEnabled() const {
- // return experimental_flags_ & ExperimentalFlags::kMethodHandles;
- return true;
+ return experimental_flags_ & ExperimentalFlags::kMethodHandles;
}
void DisallowNewSystemWeaks() REQUIRES_SHARED(Locks::mutator_lock_);