Revert "lambda: Add support for invoke-interface for boxed innate lambdas"
955-lambda is flaky
Bug: 24618608
Bug: 25107649
This reverts commit 457e874459ae638145cab6d572e34d48480e39d2.
Change-Id: I24884344d21d7a4262e53e3f5dba57032687ddb7
diff --git a/runtime/lambda/box_table.h b/runtime/lambda/box_table.h
index 9dca6ab..adb7332 100644
--- a/runtime/lambda/box_table.h
+++ b/runtime/lambda/box_table.h
@@ -30,9 +30,6 @@
class ArtMethod; // forward declaration
namespace mirror {
-class Class; // forward declaration
-class ClassLoader; // forward declaration
-class LambdaProxy; // forward declaration
class Object; // forward declaration
} // namespace mirror
@@ -51,11 +48,8 @@
using ClosureType = art::lambda::Closure*;
// Boxes a closure into an object. Returns null and throws an exception on failure.
- mirror::Object* BoxLambda(const ClosureType& closure,
- const char* class_name,
- mirror::ClassLoader* class_loader)
- REQUIRES(!Locks::lambda_table_lock_, !Roles::uninterruptible_)
- SHARED_REQUIRES(Locks::mutator_lock_);
+ mirror::Object* BoxLambda(const ClosureType& closure)
+ SHARED_REQUIRES(Locks::mutator_lock_) REQUIRES(!Locks::lambda_table_lock_);
// Unboxes an object back into the lambda. Returns false and throws an exception on failure.
bool UnboxLambda(mirror::Object* object, ClosureType* out_closure)
@@ -134,16 +128,7 @@
TrackingAllocator<std::pair<ClosureType, ValueType>,
kAllocatorTagLambdaBoxTable>>;
- using ClassMap = art::HashMap<std::string,
- GcRoot<mirror::Class>,
- EmptyFn,
- HashFn,
- EqualsFn,
- TrackingAllocator<std::pair<ClosureType, ValueType>,
- kAllocatorTagLambdaProxyClassBoxTable>>;
-
UnorderedMap map_ GUARDED_BY(Locks::lambda_table_lock_);
- UnorderedMap classes_map_ GUARDED_BY(Locks::lambda_table_lock_);
bool allow_new_weaks_ GUARDED_BY(Locks::lambda_table_lock_);
ConditionVariable new_weaks_condition_ GUARDED_BY(Locks::lambda_table_lock_);