Skip to content
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.

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

fix uint16_t bbrk on wasm.simd branch #2791

Merged
merged 1 commit into from
Apr 11, 2017

Conversation

Krovatkin
Copy link
Collaborator

@MikeHolman @Cellule fyi: @arunetm

Mike brought to our attention that our wasm.simd changes were breaking some of ChakraFull tests:

This is the error I see

2017-04-06T00:02:37.9142103Z "E:\A_work\2\s\core\lib\WasmReader\Chakra.WasmReader.vcxproj" (default target) (77:3) ->
2017-04-06T00:02:37.9142103Z (ClCompile target) ->
2017-04-06T00:02:37.9142103Z > E:\A_work\2\s\core\lib\WasmReader\WasmBinaryReader.cpp(438): error C2065: 'uint16_t': undeclared identifier [E:\A_work\2\s\core\lib\WasmReader\Chakra.WasmReader.vcxproj]

I did a quick grep and looks like this was the only instance of using std types in WasmBinaryReader

$grep  -rP  'int\d+_t[ \t;]' * | grep -v wabt
Common/Codex/Utf8Codex.h:        typedef int8_t type;
Common/Codex/Utf8Codex.h:        typedef int16_t type;
Common/Codex/Utf8Codex.h:        typedef int32_t type;
Jsrt/ChakraCommon.h:typedef uint32_t UINT32;
Jsrt/ChakraCommon.h:typedef int64_t INT64;
Jsrt/ChakraCommon.h:typedef unsigned short uint16_t;
Jsrt/ChakraCore.h:        _In_ const uint16_t *content,
Jsrt/ChakraDebug.h:typedef __int64 int64_t;
Jsrt/ChakraDebug.h:typedef unsigned __int32 uint32_t;
Jsrt/ChakraDebug.h:        _In_opt_ uint32_t kthEvent,
Jsrt/ChakraDebug.h:        _In_ int64_t targetEventTime,
Jsrt/ChakraDebug.h:        _In_ int64_t currentSnapStartTime,
Jsrt/ChakraDebug.h:        _In_ int64_t startSnapTime,
Jsrt/ChakraDebug.h:        _In_ int64_t endSnapTime,
Jsrt/ChakraDebug.h:            _In_ int64_t snapshotTime,
Jsrt/ChakraDebug.h:            _In_ int64_t eventTime);
Jsrt/Jsrt.cpp:   _In_ JsTTDMoveMode moveMode, _In_opt_ uint32_t kthEvent,
Jsrt/Jsrt.cpp:    static_assert(sizeof(int64_t) == sizeof(int64), "int64_t and int64 size mis-match");
Jsrt/Jsrt.cpp:CHAKRA_API JsTTDGetSnapShotBoundInterval(_In_ JsRuntimeHandle runtimeHandle, _In_ int64_t targetEventTime, _Out_ int64_t* startSnapTime, _Out_ int64_t* endSnapTime)
Jsrt/Jsrt.cpp:    static_assert(sizeof(int64_t) == sizeof(int64), "int64_t and int64 size mis-match");
Jsrt/Jsrt.cpp:CHAKRA_API JsTTDGetPreviousSnapshotInterval(_In_ JsRuntimeHandle runtimeHandle, _In_ int64_t currentSnapStartTime, _Out_ int64_t* previousSnapTime)
Jsrt/Jsrt.cpp:JsErrorCode TTDHandleBreakpointInfoAndInflate(TTD::EventLog* elog, int64_t snapTime, JsrtRuntime* runtime, ThreadContext* threadContext)
Jsrt/Jsrt.cpp:CHAKRA_API JsTTDPreExecuteSnapShotInterval(_In_ JsRuntimeHandle runtimeHandle, _In_ int64_t startSnapTime, _In_ int64_t endSnapTime, _In_ JsTTDMoveMode moveMode, _Out_ int64_t* newTargetEventTime)
Jsrt/Jsrt.cpp:CHAKRA_API JsTTDMoveToTopLevelEvent(_In_ JsRuntimeHandle runtimeHandle, _In_ JsTTDMoveMode moveMode, _In_ int64_t snapshotTime, _In_ int64_t eventTime)
Jsrt/Jsrt.cpp:    _In_ const uint16_t *content,
Runtime/Language/AsmJsTypes.h:    typedef uint32 uint32_t;
Runtime/PlatformAgnostic/Platform/Common/Trace.cpp:    uint32_t path_size = SELF_PATH_SIZE;
Runtime/PlatformAgnostic/Platform/Linux/UnicodeText.ICU.cpp:            int32_t normalizedStringLength = destUniStr.length();
Runtime/PlatformAgnostic/Platform/Linux/UnicodeText.ICU.cpp:            int32_t resultStringLength = 0;
Runtime/PlatformAgnostic/Platform/Linux/UnicodeText.ICU.cpp:            int8_t charType = u_charType(ch);
Runtime/PlatformAgnostic/Platform/Unix/DateTime.cpp:        int64_t absoluteTime = tv / 1000;
Runtime/PlatformAgnostic/Platform/Unix/DateTime.cpp:        int64_t absoluteTime = tv / 1000;
WasmReader/WasmBinaryReader.cpp.bak:        uint16_t offset = (op - wbExtended + 1) * 256;

@arunetm-zz
Copy link
Contributor

@Cellule Once this fix is signed off, i can validate it against the full repo and merge to the feature branch if that helps

@Krovatkin
Copy link
Collaborator Author

@dotnet-bot test Ubuntu static_ubuntu_linux_debug please . Pretty please?

@Krovatkin
Copy link
Collaborator Author

@dotnet-bot test OSX static_osx_osx_test please. Seems to be a tough day :-)

@Cellule Cellule self-requested a review April 6, 2017 18:03
@Cellule
Copy link
Contributor

Cellule commented Apr 6, 2017

@arunetm LGTM after you confirm the build is fixed in full
Thanks

@arunetm-zz
Copy link
Contributor

Thanks, Sorting out some access issues while validating Full. Will get back on this soon.

@arunetm-zz
Copy link
Contributor

Full builds pass now. We can merge this.

@Cellule can you help merge this change. Seems like I dont have the permissions in place to merge.

@chakrabot chakrabot merged commit 38ec30d into chakra-core:wasm.simd Apr 11, 2017
chakrabot pushed a commit that referenced this pull request Apr 11, 2017
Merge pull request #2791 from Krovatkin:wasm-simd-collab
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants