Commit aecfa71b by Yuly Novikov Committed by Commit Bot

Print more logs

1. Really print WARN with default platform 2. Print UNREACHABLE, was getting lost because ~LogMessage was not reached BUG=angleproject:1660 Change-Id: I56fad24895adfec8d81539c6628e65ec2f9e7722 Reviewed-on: https://chromium-review.googlesource.com/1021592Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
parent 8ceea819
...@@ -45,7 +45,7 @@ bool ShouldCreateLogMessage(LogSeverity severity) ...@@ -45,7 +45,7 @@ bool ShouldCreateLogMessage(LogSeverity severity)
#if defined(ANGLE_TRACE_ENABLED) #if defined(ANGLE_TRACE_ENABLED)
return true; return true;
#elif defined(ANGLE_ENABLE_ASSERTS) #elif defined(ANGLE_ENABLE_ASSERTS)
return severity == LOG_ERR; return severity != LOG_EVENT;
#else #else
return false; return false;
#endif #endif
......
...@@ -272,10 +272,13 @@ constexpr LogSeverity LOG_ASSERT = LOG_EVENT; ...@@ -272,10 +272,13 @@ constexpr LogSeverity LOG_ASSERT = LOG_EVENT;
ANGLE_EMPTY_STATEMENT ANGLE_EMPTY_STATEMENT
// A macro for code which is not expected to be reached under valid assumptions // A macro for code which is not expected to be reached under valid assumptions
#define UNREACHABLE() \ #define UNREACHABLE() \
((ERR() << "\t! Unreachable reached: " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ \ { \
<< ")"), \ ERR() << "\t! Unreachable reached: " << __FUNCTION__ << "(" << __FILE__ << ":" << __LINE__ \
ASSERT(false)) << ")"; \
ASSERT(false); \
} \
ANGLE_EMPTY_STATEMENT
#else #else
#define UNIMPLEMENTED() \ #define UNIMPLEMENTED() \
{ \ { \
...@@ -284,7 +287,11 @@ constexpr LogSeverity LOG_ASSERT = LOG_EVENT; ...@@ -284,7 +287,11 @@ constexpr LogSeverity LOG_ASSERT = LOG_EVENT;
ANGLE_EMPTY_STATEMENT ANGLE_EMPTY_STATEMENT
// A macro for code which is not expected to be reached under valid assumptions // A macro for code which is not expected to be reached under valid assumptions
#define UNREACHABLE() ASSERT(false) #define UNREACHABLE() \
{ \
ASSERT(false); \
} \
ANGLE_EMPTY_STATEMENT
#endif // defined(ANGLE_TRACE_ENABLED) || defined(ANGLE_ENABLE_ASSERTS) #endif // defined(ANGLE_TRACE_ENABLED) || defined(ANGLE_ENABLE_ASSERTS)
#endif // COMMON_DEBUG_H_ #endif // COMMON_DEBUG_H_
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
// Unfortunately ANGLE relies on ASSERT being an empty statement, which these libs don't respect. // Unfortunately ANGLE relies on ASSERT being an empty statement, which these libs don't respect.
#ifndef NOTREACHED #ifndef NOTREACHED
#define NOTREACHED() UNREACHABLE() #define NOTREACHED() ({ UNREACHABLE(); })
#endif #endif
#endif // ANGLEBASE_LOGGING_H_ #endif // ANGLEBASE_LOGGING_H_
...@@ -41,7 +41,7 @@ angle::CheckedNumeric<GLsizeiptr> GetVerticesNeededForDraw(GLenum primitiveMode, ...@@ -41,7 +41,7 @@ angle::CheckedNumeric<GLsizeiptr> GetVerticesNeededForDraw(GLenum primitiveMode,
case GL_POINTS: case GL_POINTS:
return checkedPrimcount * checkedCount; return checkedPrimcount * checkedCount;
default: default:
NOTREACHED(); UNREACHABLE();
return checkedPrimcount * checkedCount; return checkedPrimcount * checkedCount;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment