From 0b5fbf367dff4fe5fabba6792a5750d8c39295ee Mon Sep 17 00:00:00 2001 From: David Vacca Date: Wed, 24 Mar 2021 17:18:17 -0700 Subject: [PATCH] Remove exceptions from MapBuffer class Summary: In Fabric we don't throw exception. This diff removes exception from MapBuffer class changelog: [internal] internal Reviewed By: JoshuaGross, sammy-SC Differential Revision: D27303496 fbshipit-source-id: 3f8c3bd2b41121672ef05153459b20cdc2efcda3 --- ReactCommon/react/renderer/mapbuffer/BUCK | 8 ++++++++ ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp | 2 +- ReactCommon/react/renderer/mapbuffer/MapBuffer.h | 1 + ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h | 1 + 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ReactCommon/react/renderer/mapbuffer/BUCK b/ReactCommon/react/renderer/mapbuffer/BUCK index 39bdca768f8..61d0e061ea5 100644 --- a/ReactCommon/react/renderer/mapbuffer/BUCK +++ b/ReactCommon/react/renderer/mapbuffer/BUCK @@ -2,11 +2,16 @@ load( "//tools/build_defs/oss:rn_defs.bzl", "ANDROID", "fb_xplat_cxx_test", + "get_apple_compiler_flags", + "get_apple_inspector_flags", + "get_preprocessor_flags_for_build_mode", "react_native_xplat_target", "rn_xplat_cxx_library", "subdir_glob", ) +APPLE_COMPILER_FLAGS = get_apple_compiler_flags() + rn_xplat_cxx_library( name = "mapbuffer", srcs = glob( @@ -30,12 +35,15 @@ rn_xplat_cxx_library( "-std=c++14", "-Wall", ], + fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, + fbobjc_preprocessor_flags = get_preprocessor_flags_for_build_mode() + get_apple_inspector_flags(), force_static = True, labels = ["supermodule:xplat/default/public.react_native.infra"], macosx_tests_override = [], platforms = (ANDROID), preprocessor_flags = [ "-DLOG_TAG=\"ReactNative\"", + "-DWITH_FBSYSTRACE=1", ], tests = [":tests"], visibility = ["PUBLIC"], diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp index 67008512d13..e923fe11432 100644 --- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp +++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.cpp @@ -32,7 +32,7 @@ MapBuffer::MapBuffer(uint8_t *const data, uint16_t dataSize) { if (dataSize != dataSize_) { LOG(ERROR) << "Error: Data size does not match, expected " << dataSize << " found: " << dataSize_; - throw "Error: Data size does not match"; + abort(); } } diff --git a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h index 7cc78f83dda..ebe2c3336fd 100644 --- a/ReactCommon/react/renderer/mapbuffer/MapBuffer.h +++ b/ReactCommon/react/renderer/mapbuffer/MapBuffer.h @@ -9,6 +9,7 @@ #include +#include #include namespace facebook { diff --git a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h index e63d921d69e..39e43b536c9 100644 --- a/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h +++ b/ReactCommon/react/renderer/mapbuffer/MapBufferBuilder.h @@ -9,6 +9,7 @@ #include #include +#include namespace facebook { namespace react {