do not merge: cherry-picked ecd23c09e87d7088285f8b7c2eeb98815c2e69e0 from master branch (7f5b1a2b) · Commits · e / os / android_system_core

libacc/acc.cpp

+10 −3

Original line number	Original line	Diff line number	Diff line
	@@ -8,6 +8,9 @@
	*		*
	*/		*/

			#define LOG_TAG "acc"
			#include <cutils/log.h>

	#include <ctype.h>		#include <ctype.h>
	#include <errno.h>		#include <errno.h>
	#include <stdarg.h>		#include <stdarg.h>
	@@ -51,6 +54,8 @@
	#define ENABLE_ARM_DISASSEMBLY		#define ENABLE_ARM_DISASSEMBLY
	// #define PROVIDE_TRACE_CODEGEN		// #define PROVIDE_TRACE_CODEGEN

			#define assert(b) assertImpl(b, __LINE__)

	namespace acc {		namespace acc {

	// Subset of STL vector.		// Subset of STL vector.
	@@ -562,10 +567,11 @@ class Compiler : public ErrorSink {
	va_end(ap);		va_end(ap);
	}		}

	void assert(bool test) {		void assertImpl(bool test, int line) {
	if (!test) {		if (!test) {
			error("code generator assertion failed at line %s:%d.", __FILE__, line);
			LOGD("code generator assertion failed at line %s:%d.", __FILE__, line);
	* (char*) 0 = 0;		* (char*) 0 = 0;
	error("code generator assertion failed.");
	}		}
	}		}

	@@ -3436,8 +3442,9 @@ class Compiler : public ErrorSink {
	* (char*) 0 = 0;		* (char*) 0 = 0;
	}		}

	void assert(bool isTrue) {		void assertImpl(bool isTrue, int line) {
	if (!isTrue) {		if (!isTrue) {
			LOGD("assertion failed at line %s:%d.", __FILE__, line);
	internalError();		internalError();
	}		}
	}		}