Merge "Replace some run-time assertions with compile-time ones in ART."

author Roland Levillain <rpl@google.com>

Tue, 23 Jun 2015 13:53:54 +0000 (13:53 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 23 Jun 2015 13:53:55 +0000 (13:53 +0000)
author Roland Levillain <rpl@google.com>
Tue, 23 Jun 2015 13:53:54 +0000 (13:53 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 23 Jun 2015 13:53:55 +0000 (13:53 +0000)
diff --cc compiler/optimizing/code_generator_arm.cc
Simple merge
diff --cc compiler/optimizing/code_generator_x86_64.cc
Simple merge
diff --cc runtime/debugger.cc
Simple merge
diff --cc runtime/mirror/class-inl.h
Simple merge
diff --cc runtime/thread.cc
Simple merge
author	Roland Levillain <rpl@google.com>
	Tue, 23 Jun 2015 13:53:54 +0000 (13:53 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 23 Jun 2015 13:53:55 +0000 (13:53 +0000)
		1	2
compiler/optimizing/code_generator_arm.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/optimizing/code_generator_x86_64.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/debugger.cc	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/mirror/class-inl.h	patch \|	diff1 \|	diff2 \|	blob \| history
runtime/thread.cc	patch \|	diff1 \|	diff2 \|	blob \| history