Revert "cleanup: Replace pointers with out-parameters and fix-up formatting"
This reverts commit a315f5c546b796f55f4872bb6efc15eb858d9639.
--
Revert "runtime: cleanup class_linker out-parameters and formatting"
This reverts commit bc1d78daa463572c5a770cdca858a3b51d8e1b7b.
--
Revert "base: replace raw pointers for out-parameters with safer out<T>"
This reverts commit fb326cffc679cab8eb873b9e44795706f023cb3c.
diff --git a/runtime/runtime.h b/runtime/runtime.h
index 206623e..4577b75 100644
--- a/runtime/runtime.h
+++ b/runtime/runtime.h
@@ -28,7 +28,6 @@
#include "arch/instruction_set.h"
#include "base/macros.h"
-#include "base/out.h"
#include "gc_root.h"
#include "instrumentation.h"
#include "jobject_comparator.h"
@@ -225,9 +224,7 @@
jobject GetSystemClassLoader() const;
// Attaches the calling native thread to the runtime.
- bool AttachCurrentThread(const char* thread_name,
- bool as_daemon,
- jobject thread_group,
+ bool AttachCurrentThread(const char* thread_name, bool as_daemon, jobject thread_group,
bool create_peer);
void CallExitHook(jint status);
@@ -289,7 +286,8 @@
mirror::Throwable* GetPreAllocatedOutOfMemoryError() SHARED_REQUIRES(Locks::mutator_lock_);
- mirror::Throwable* GetPreAllocatedNoClassDefFoundError() SHARED_REQUIRES(Locks::mutator_lock_);
+ mirror::Throwable* GetPreAllocatedNoClassDefFoundError()
+ SHARED_REQUIRES(Locks::mutator_lock_);
const std::vector<std::string>& GetProperties() const {
return properties_;
@@ -318,7 +316,8 @@
void VisitImageRoots(RootVisitor* visitor) SHARED_REQUIRES(Locks::mutator_lock_);
// Visit all of the roots we can do safely do concurrently.
- void VisitConcurrentRoots(RootVisitor* visitor, VisitRootFlags flags = kVisitRootFlagAllRoots)
+ void VisitConcurrentRoots(RootVisitor* visitor,
+ VisitRootFlags flags = kVisitRootFlagAllRoots)
SHARED_REQUIRES(Locks::mutator_lock_);
// Visit all of the non thread roots, we can do this with mutators unpaused.
@@ -332,8 +331,7 @@
void VisitThreadRoots(RootVisitor* visitor) SHARED_REQUIRES(Locks::mutator_lock_);
// Flip thread roots from from-space refs to to-space refs.
- size_t FlipThreadRoots(Closure* thread_flip_visitor,
- Closure* flip_callback,
+ size_t FlipThreadRoots(Closure* thread_flip_visitor, Closure* flip_callback,
gc::collector::GarbageCollector* collector)
REQUIRES(!Locks::mutator_lock_);
@@ -469,34 +467,20 @@
void ThrowTransactionAbortError(Thread* self)
SHARED_REQUIRES(Locks::mutator_lock_);
- void RecordWriteFieldBoolean(mirror::Object* obj,
- MemberOffset field_offset,
- uint8_t value,
+ void RecordWriteFieldBoolean(mirror::Object* obj, MemberOffset field_offset, uint8_t value,
bool is_volatile) const;
- void RecordWriteFieldByte(mirror::Object* obj,
- MemberOffset field_offset,
- int8_t value,
+ void RecordWriteFieldByte(mirror::Object* obj, MemberOffset field_offset, int8_t value,
bool is_volatile) const;
- void RecordWriteFieldChar(mirror::Object* obj,
- MemberOffset field_offset,
- uint16_t value,
+ void RecordWriteFieldChar(mirror::Object* obj, MemberOffset field_offset, uint16_t value,
bool is_volatile) const;
- void RecordWriteFieldShort(mirror::Object* obj,
- MemberOffset field_offset,
- int16_t value,
+ void RecordWriteFieldShort(mirror::Object* obj, MemberOffset field_offset, int16_t value,
bool is_volatile) const;
- void RecordWriteField32(mirror::Object* obj,
- MemberOffset field_offset,
- uint32_t value,
+ void RecordWriteField32(mirror::Object* obj, MemberOffset field_offset, uint32_t value,
bool is_volatile) const;
- void RecordWriteField64(mirror::Object* obj,
- MemberOffset field_offset,
- uint64_t value,
+ void RecordWriteField64(mirror::Object* obj, MemberOffset field_offset, uint64_t value,
bool is_volatile) const;
- void RecordWriteFieldReference(mirror::Object* obj,
- MemberOffset field_offset,
- mirror::Object* value,
- bool is_volatile) const;
+ void RecordWriteFieldReference(mirror::Object* obj, MemberOffset field_offset,
+ mirror::Object* value, bool is_volatile) const;
void RecordWriteArray(mirror::Array* array, size_t index, uint64_t value) const
SHARED_REQUIRES(Locks::mutator_lock_);
void RecordStrongStringInsertion(mirror::String* s) const
@@ -515,7 +499,7 @@
return fault_message_;
}
- void AddCurrentRuntimeFeaturesAsDex2OatArguments(out<std::vector<std::string>> arg_vector) const;
+ void AddCurrentRuntimeFeaturesAsDex2OatArguments(std::vector<std::string>* arg_vector) const;
bool ExplicitStackOverflowChecks() const {
return !implicit_so_checks_;