chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the use of __has_builtin for GCC < 10.

Browse Source 
The breakage was introduced in af12322e9d.

__has_builtin was introduced to GCC in version 10, and the arithmetic overflow builtins were available since version 5.

Fixes deepmind/mujoco#386.

Tested with GCC 9.

PiperOrigin-RevId: 461463027
Change-Id: I76627539a5c0e7f5617b56a2c9ada9251bceb0f6
This commit is contained in:
Nimrod Gileadi
2022-07-17 07:51:08 -07:00
committed by Copybara-Service
parent 5ef1e59f06
commit 1392843aed
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_io.c
+6 -2
View File
@@ -45,6 +45,10 @@
#pragma warning (disable: 4305) // disable MSVC warning: truncation from 'double' to 'float' #pragma warning (disable: 4305) // disable MSVC warning: truncation from 'double' to 'float'
#endif #endif
#ifndef __has_builtin
#define __has_builtin(x) 0
#endif
#define PTRDIFF(x, y) ((void*)(x) - (void*)(y)) #define PTRDIFF(x, y) ((void*)(x) - (void*)(y))
@@ -357,8 +361,8 @@ static void mj_setPtrModel(mjModel* m) {
// *nbuffer += SKIP(*offset) + type_size*nr*nc; // *nbuffer += SKIP(*offset) + type_size*nr*nc;
// *offset += SKIP(*offset) + type_size*nr*nc; // *offset += SKIP(*offset) + type_size*nr*nc;
static int safeAddToBufferSize(intptr_t* offset, int* nbuffer, size_t type_size, int nr, int nc) { static int safeAddToBufferSize(intptr_t* offset, int* nbuffer, size_t type_size, int nr, int nc) {
#if defined(__has_builtin) \ #if (__has_builtin(__builtin_add_overflow) && __has_builtin(__builtin_mul_overflow)) \
&& __has_builtin(__builtin_add_overflow) && __has_builtin(__builtin_mul_overflow) || (defined(__GNUC__) && __GNUC__ >= 5)
// supported by GCC and Clang // supported by GCC and Clang
int to_add = 0; int to_add = 0;
if (__builtin_mul_overflow(nc, nr, &to_add)) return 0; if (__builtin_mul_overflow(nc, nr, &to_add)) return 0;