Merge "[optimizing] Don't record None locations in the stack maps."

author Nicolas Geoffray <ngeoffray@google.com>

Fri, 13 Mar 2015 18:46:44 +0000 (18:46 +0000)

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

Fri, 13 Mar 2015 18:46:44 +0000 (18:46 +0000)
author Nicolas Geoffray <ngeoffray@google.com>
Fri, 13 Mar 2015 18:46:44 +0000 (18:46 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Fri, 13 Mar 2015 18:46:44 +0000 (18:46 +0000)
diff --cc compiler/optimizing/code_generator.cc
Simple merge
diff --cc compiler/optimizing/code_generator.h
Simple merge
author	Nicolas Geoffray <ngeoffray@google.com>
	Fri, 13 Mar 2015 18:46:44 +0000 (18:46 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Fri, 13 Mar 2015 18:46:44 +0000 (18:46 +0000)
		1	2
compiler/optimizing/code_generator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/optimizing/code_generator.h	patch \|	diff1 \|	diff2 \|	blob \| history