Update SDL (#2073)

* more sdl changes

* more fixes

* update SDL

* cleanup

* cleanup

* rename var

* redo how in_transition is handled

* add -O2 flag back

CMakeLists.txt

@@ -168,6 +168,8 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
     include( cmake/clang_4_0_flags.cmake )
 endif()
 
+include(cmake/sdl.cmake)
+
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -203,24 +205,6 @@ if (DEFINED NGRAPH_TUNE_ARCH)
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mtune=${NGRAPH_TUNE_ARCH}")
 endif()
 
-# flags required for SDL-3
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -fPIE -D_FORTIFY_SOURCE=2")
-if (NOT WIN32)
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wformat -Wformat-security")
-endif()
-if (NOT APPLE)
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z noexecstack")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -z relro -z now")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
-endif()
-if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
-    if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")
-    else()
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
-    endif()
-endif()
-
 if (NGRAPH_USE_GOLD)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fuse-ld=gold")
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fuse-ld=gold")
@@ -301,6 +285,8 @@ endif()
 
 add_definitions(-DPROJECT_ROOT_DIR="${CMAKE_CURRENT_SOURCE_DIR}")
 
+message(STATUS "Compile Flags: ${CMAKE_CXX_FLAGS}")
+message(STATUS "Shared Link Flags: ${CMAKE_SHARED_LINKER_FLAGS}")
 add_subdirectory(src)
 
 if (NGRAPH_UNIT_TEST_ENABLE)

cmake/sdl.cmake

+#===============================================================================
+# Copyright 2017-2018 Intel Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#===============================================================================
+
+# Manage secure Development Lifecycle-related compiler flags
+#===============================================================================
+
+if(SDL_cmake_included)
+    return()
+endif()
+set(SDL_cmake_included true)
+
+if(UNIX)
+    set(SDL_CXX_FLAGS "-O2 -fPIC -Wformat -Wformat-security")
+    set(SDL_CXX_FLAGS "${SDL_CXX_FLAGS} -D_FORTIFY_SOURCE=2")
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
+    if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
+        if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+            set(SDL_CXX_FLAGS "${SDL_CXX_FLAGS} -fstack-protector-all")
+        else()
+            set(SDL_CXX_FLAGS "${SDL_CXX_FLAGS} -fstack-protector-strong")
+        endif()
+
+        # GCC might be very paranoid for partial structure initialization, e.g.
+        #   struct { int a, b; } s = { 0, };
+        # However the behavior is triggered by `Wmissing-field-initializers`
+        # only. To prevent warnings on users' side who use the library and turn
+        # this warning on, let's use it too. Applicable for the library sources
+        # and interfaces only (tests currently rely on that fact heavily)
+        # set(CMAKE_SRC_CCXX_FLAGS "${CMAKE_SRC_CCXX_FLAGS} -Wmissing-field-initializers")
+        # set(CMAKE_EXAMPLE_CCXX_FLAGS "${CMAKE_EXAMPLE_CCXX_FLAGS} -Wmissing-field-initializers")
+    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+        set(SDL_CXX_FLAGS "${SDL_CXX_FLAGS} -fstack-protector-all")
+    elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector")
+    endif()
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${SDL_CXX_FLAGS}")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SDL_CXX_FLAGS}")
+    if(APPLE)
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-bind_at_load")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-bind_at_load")
+    else()
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
+        set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
+        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now")
+    endif()
+endif()

src/ngraph/node.cpp

@@ -50,25 +50,24 @@ Node::Node(const std::string& node_type, const NodeVector& arguments, size_t out
 }
 
 // While we are still doing validation and type inference in the constructor, this is true
-// It can be set to false to debug doing validation/inference after construction. When that
-// is working, these two functions will be removed.
-static bool in_transition = true;
+// The #define can be commented out to debug doing validation/inference after construction.
+// When that is working, these two functions will be removed.
+#define IN_TRANSITION
 
 void Node::constructor_validate_and_infer_types()
 {
-    if (in_transition)
-    {
-        validate_and_infer_types();
-    }
+#ifdef IN_TRANSITION
+    validate_and_infer_types();
+#endif
 }
 
 void Node::delayed_validate_and_infer_types()
 {
-    if (!in_transition)
-    {
-        validate_and_infer_types();
-    }
+#ifndef IN_TRANSITION
+    validate_and_infer_types();
+#endif
 }
+#undef IN_TRANSITION
 
 void Node::set_output_size(size_t n)
 {