commit | c65310326ea87008776bd64ed3bb530d8da644c3 | [log] [tgz] |
---|---|---|
author | Narayan Kamath <narayan@google.com> | Wed Nov 02 13:03:28 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Wed Nov 02 13:03:28 2016 +0000 |
tree | 4e65947d1d0c8fa472d5996f21f8a15b8aed45b8 | |
parent | a4af47ebf5aa8ee0e7f55b96b139f1c97bab1d55 [diff] | |
parent | 3d74bf45706429f0cbfce0c1e7d213416c5ecf50 [diff] |
Merge "Revert accidental change introduced in 000e188570."
diff --git a/runtime/runtime.h b/runtime/runtime.h index 86464ab..77ec238 100644 --- a/runtime/runtime.h +++ b/runtime/runtime.h
@@ -316,8 +316,7 @@ } bool IsMethodHandlesEnabled() const { - // return experimental_flags_ & ExperimentalFlags::kMethodHandles; - return true; + return experimental_flags_ & ExperimentalFlags::kMethodHandles; } void DisallowNewSystemWeaks() REQUIRES_SHARED(Locks::mutator_lock_);