Skip to content

Commit 8466a70

Browse files
committed
Turn off flaky RapidJSON optimization on x64
1 parent dbd4cbb commit 8466a70

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

src/native/corehost/comhost/clsidmap.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
#include <wintrust.h>
1212
#include <Softpub.h>
1313

14+
#include <json_parser.h>
1415
#include <external/rapidjson/document.h>
1516
#include <external/rapidjson/istreamwrapper.h>
16-
#include <json_parser.h>
1717

1818
using comhost::clsid_map_entry;
1919
using comhost::clsid_map;

src/native/corehost/json_parser.h

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,9 @@
44
#ifndef __JSON_PARSER_H__
55
#define __JSON_PARSER_H__
66

7-
#ifdef __sun
8-
// This optimization relies on zeros in higher 16-bits, whereas SunOS has 1s. More details at
9-
// https://github.com/Tencent/rapidjson/issues/1596.
10-
// The impact here was that runtimeOptions key available in hwapp.runtimeconfig.json was not
11-
// located by RapidJson's FindMember() API from runtime_config_t::ensure_parsed().
7+
// Turn off flaky optimization. For details, see:
8+
// https://github.com/Tencent/rapidjson/issues/1596#issuecomment-548774663
129
#define RAPIDJSON_48BITPOINTER_OPTIMIZATION 0
13-
#endif
1410

1511
#include "pal.h"
1612
#include <external/rapidjson/document.h>

0 commit comments

Comments
 (0)