Commit 44a0e734 by Jamie Madill Committed by Commit Bot

Re-enable -Wextra-semi-stmt.

Now that the DEPS roller is fixed this should not be able to break the CQ. Bug: angleproject:3128 Change-Id: I0f51b5d8a7b71859cced335ca9bd6ad155637ec5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1781619 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 04d3de54
...@@ -123,14 +123,12 @@ config("extra_warnings") { ...@@ -123,14 +123,12 @@ config("extra_warnings") {
} }
if (is_clang) { if (is_clang) {
cflags += [ cflags += [
# Enable after anglebug.com/3128 is fixed. "-Wexit-time-destructors",
# "-Wextra-semi-stmt", "-Wextra-semi-stmt",
"-Wfloat-conversion", "-Wfloat-conversion",
"-Wglobal-constructors",
"-Wnon-virtual-dtor", "-Wnon-virtual-dtor",
"-Wunneeded-internal-declaration", "-Wunneeded-internal-declaration",
"-Wglobal-constructors",
"-Wexit-time-destructors",
# The below warnings are used by WebKit. We enable them to make rolling # The below warnings are used by WebKit. We enable them to make rolling
# ANGLE in WebKit easier. # ANGLE in WebKit easier.
......
...@@ -94,7 +94,6 @@ egl::Error ImageVk::initialize(const egl::Display *display) ...@@ -94,7 +94,6 @@ egl::Error ImageVk::initialize(const egl::Display *display)
ASSERT(mContext != nullptr); ASSERT(mContext != nullptr);
renderer = vk::GetImpl(mContext)->getRenderer(); renderer = vk::GetImpl(mContext)->getRenderer();
;
} }
else if (egl::IsExternalImageTarget(mState.target)) else if (egl::IsExternalImageTarget(mState.target))
{ {
......
...@@ -478,6 +478,8 @@ ...@@ -478,6 +478,8 @@
#define INTERNAL_TRACE_EVENT_ADD_SCOPED(platform, category, name, ...) \ #define INTERNAL_TRACE_EVENT_ADD_SCOPED(platform, category, name, ...) \
INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(platform, category); \ INTERNAL_TRACE_EVENT_GET_CATEGORY_INFO(platform, category); \
gl::TraceEvent::TraceEndOnScopeClose INTERNALTRACEEVENTUID(profileScope); \ gl::TraceEvent::TraceEndOnScopeClose INTERNALTRACEEVENTUID(profileScope); \
do \
{ \
if (*INTERNALTRACEEVENTUID(catstatic)) \ if (*INTERNALTRACEEVENTUID(catstatic)) \
{ \ { \
gl::TraceEvent::addTraceEvent( \ gl::TraceEvent::addTraceEvent( \
...@@ -485,7 +487,8 @@ ...@@ -485,7 +487,8 @@
gl::TraceEvent::noEventId, TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \ gl::TraceEvent::noEventId, TRACE_EVENT_FLAG_NONE, ##__VA_ARGS__); \
INTERNALTRACEEVENTUID(profileScope) \ INTERNALTRACEEVENTUID(profileScope) \
.initialize(platform, INTERNALTRACEEVENTUID(catstatic), name); \ .initialize(platform, INTERNALTRACEEVENTUID(catstatic), name); \
} } \
} while (0)
// Implementation detail: internal macro to create static category and add // Implementation detail: internal macro to create static category and add
// event if the category is enabled. // event if the category is enabled.
......
...@@ -247,7 +247,7 @@ protected: ...@@ -247,7 +247,7 @@ protected:
memset(&c, 0, sizeof(CONTEXT)); \ memset(&c, 0, sizeof(CONTEXT)); \
c.ContextFlags = contextFlags; \ c.ContextFlags = contextFlags; \
RtlCaptureContext(&c); \ RtlCaptureContext(&c); \
} while (0); } while (0)
#endif #endif
#endif //defined(_MSC_VER) #endif //defined(_MSC_VER)
......
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