From 14832efeb92334c562ebedef34e920d30e3cee69 Mon Sep 17 00:00:00 2001 From: Narayan Kamath Date: Fri, 5 Aug 2016 11:44:32 +0100 Subject: Revert experimental lambda feature. This is a revert of the following changes : 30c475a2046951a81769c2db0b2dad66cd71e189. lambda: Minor capture-variable/liberate-variable clean-up after post-merge reviews. 6918bf13eb855b3aa8ccdddda2d27ae8c60cec56. lambda: Experimental support for capture-variable and liberate-variable fc1ccd740b7c8e96dfac675cfc580122cd1b40a6. lambda: Infrastructure to support capture/liberate-variable dex opcodes e2facc5b18cd756a8b5500fb3d90da69c9ee0fb7. runtime: Add lambda box/unbox object equality 2ee54e249ad21c74f29a161e248bebe7d22fddf1. runtime: Partially implement box-lambda and unbox-lambda experimental opcodes 158f35c98e2ec0d40d2c032b8cdce5fb60944a7f. interpreter: Add experimental lambda opcodes for invoke/create-lambda a3bb72036f5454e410467f7151dc89f725ae1151. Added format 25x to dexdump(2). Plus surrounding cleanups. Test: make test-art Change-Id: Ic6f999ad17385ef933f763641049cf721510b202 --- runtime/lambda/leaking_allocator.cc | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 runtime/lambda/leaking_allocator.cc (limited to 'runtime/lambda/leaking_allocator.cc') diff --git a/runtime/lambda/leaking_allocator.cc b/runtime/lambda/leaking_allocator.cc deleted file mode 100644 index 22bb294d03..0000000000 --- a/runtime/lambda/leaking_allocator.cc +++ /dev/null @@ -1,33 +0,0 @@ -/* - * Copyright (C) 2015 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#include "base/bit_utils.h" -#include "lambda/leaking_allocator.h" -#include "linear_alloc.h" -#include "runtime.h" - -namespace art { -namespace lambda { - -void* LeakingAllocator::AllocateMemoryImpl(Thread* self, size_t byte_size, size_t align_size) { - // TODO: use GetAllocatorForClassLoader to allocate lambda ArtMethod data. - void* mem = Runtime::Current()->GetLinearAlloc()->Alloc(self, byte_size); - DCHECK_ALIGNED_PARAM(reinterpret_cast(mem), align_size); - return mem; -} - -} // namespace lambda -} // namespace art -- cgit v1.2.3-59-g8ed1b