Skip to content

Turn off flaky RapidJSON optimization on x64 #64851

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Turn off flaky RapidJSON optimization on x64 #64851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/native/corehost/comhost/clsidmap.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
#include <wintrust.h>
#include <Softpub.h>

#include <json_parser.h>
#include <external/rapidjson/document.h>
#include <external/rapidjson/istreamwrapper.h>
#include <json_parser.h>

using comhost::clsid_map_entry;
using comhost::clsid_map;
Expand Down
8 changes: 2 additions & 6 deletions src/native/corehost/json_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@
#ifndef __JSON_PARSER_H__
#define __JSON_PARSER_H__

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

#include "pal.h"
#include <external/rapidjson/document.h>
Expand Down