Add additional ETW instrumentation

.gitattributes

@@ -2,3 +2,10 @@
 *.cmd -crlf
 test/**/*.js -crlf
 test/es6/HTMLComments.js binary diff=cpp
+*.wasm binary
+*.cpp text eol=lf diff=cpp
+*.h text eol=lf diff=cpp
+*.inl text eol=lf diff=cpp
+*.vcproj text eol=crlf diff=xml
+*.vcxproj text eol=crlf diff=xml
+*.sln text eol=crlf diff=xml

.gitignore

@@ -1,61 +1,109 @@
+# Visual Studio
+*_i.c
+*_p.c
+*.aps
+*.bak
+*.cache
+*.dll
+*.err
+*.exe
+*.i
+*.ilk
+*.lib
 *.log
+*.ncb
+*.obj
+*.opendb
+*.opensdf
+*.pch
+*.pdb
+*.sbr
 *.sdf
 *.suo
-*.opensdf
-*.VC.db
-*.opendb
+*.tlb
+*.tlh
 *.user
-*.i
-*.pyc
-.vscode/
-Build/VCBuild/
-Build/VCBuild.NoJIT/
-Build/ipch/
-Build/.vs/
-Build/Chakra.Core.VC.db
+*.VC.db
+*.vcxproj.user
+*.vspscc
+*.wrn
+.vs/
+
+# Visual Studio Extensions
+*.vadbg
+*.args.json
+
+# Build Artifacts
+build_*.err
 build_*.log
 build_*.wrn
-build_*.err
+Build/ipch/
+Build/swum-cache.txt
+Build/VCBuild.NoJIT/
+Build/VCBuild.SWB/
+Build/VCBuild/
 buildchk.*
 buildfre.*
-Build/swum-cache.txt
-BuildLinux/
+out/
+_DROP/
 
+# Generated Files
+*.bc
+*.dpl.*
+*.nupkg
+*.pyc
+*.tlog/
+/test/_ttdlog/*
 ComputedEnvironment.cmd
 packages/
-*.tlog/
-.*.swp
+profile.dpl.*
 sd.ini
-*.vcxproj.user
 test/*/*.baseline.rebase
-testout*
-*.dpl.*
-profile.dpl.*
-*.bc
-*.err
-Build/Chakra.Core.VC.opendb
-test/benchmarks/*.txt
 test/benchmarks/*.dpl
-/test/_ttdlog/*
-!/test/_ttdlog/readme.txt
-
-/Build/Chakra.Core.VC.db
-*.nupkg
+test/benchmarks/*.txt
+testout*
+packages.config
+lib/wabt/built/
 
 # CMake Files
+cmake_install.cmake
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
-cmake_install.cmake
 install_manifest.txt
 
 # xcode
 *.xcodeproj
 *.xcworkspace
 
+# VIM
+.*.swo
+.*.swp
+tags
+
+# VS Code
+.vscode/
+
 # additional *nix generated files
 *.a
 *.gch
+*.o
+*.so
+*.dylib
 Makefile
 pal/src/config.h
+DbgController.js.h
+lib/wabt/built/config.h
+
+# Generated by other tools
+*.lldb.cmd
+*.orig
+deps/
 
+.DS_Store
+android-toolchain-arm/
+cc-toolchain/
+/TraceOutput.txt
+Build/VcBuild
+Build/VcBuild.NoJIT
+Build/VcBuild.SWB

Build/CMakeFeatureDetect.cmake

@@ -0,0 +1,42 @@
+#-------------------------------------------------------------------------------------------------------
+# Copyright (C) Microsoft. All rights reserved.
+# Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+#-------------------------------------------------------------------------------------------------------
+
+include(CheckCXXSourceCompiles)
+include(CheckCXXSourceRuns)
+
+if(CC_TARGET_OS_OSX)
+    # by default this is disabled for osx
+    # enable temporarily
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+        -Werror"
+        )
+endif()
+
+check_cxx_source_runs("
+#include <stdlib.h>
+#include <stdio.h>
+
+__attribute__((disable_tail_calls))
+int inc(int a) { return a + 1; }
+
+int main(int argc, char **argv) {
+  printf(\"%d\", inc(argc + 1));
+  exit(0);
+}" CLANG_HAS_DISABLE_TAIL_CALLS_CFG)
+
+if(CLANG_HAS_DISABLE_TAIL_CALLS_CFG STREQUAL 1)
+  add_definitions(-DCLANG_HAS_DISABLE_TAIL_CALLS=1)
+  set(CXX_DO_NOT_OPTIMIZE_SIBLING_CALLS "")
+else()
+  set(CXX_DO_NOT_OPTIMIZE_SIBLING_CALLS "-fno-optimize-sibling-calls")
+endif()
+
+if(CC_TARGET_OS_OSX)
+    # by default this is disabled for osx
+    # disable back
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
+        -Wno-error"
+        )
+endif()

Build/Chakra.Build.Clang.props

@@ -4,7 +4,7 @@
     <ClCompile>
       <AdditionalOptions>
         %(AdditionalOptions)
-        -msse4.1
+        -msse4.2
         -Qunused-arguments
         -Wno-unknown-pragmas
         -Wno-writable-strings

Build/Chakra.Build.Default.props

@@ -2,10 +2,27 @@
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="Common.Build.Default.props"/>
   <Import Condition="'$(Clang)'!=''" Project="Chakra.Build.Clang.Default.props"/>
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'==''">
+      <!-- Default the installed latest Win10 SDK -->
+      <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
+      <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
+      <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>
+      <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@ProductVersion)</WindowsTargetPlatformVersion_10>      
+      <!-- Sometimes the version in the registry has to .0 suffix, and sometimes it doesn't. Check and add it -->
+      <WindowsTargetPlatformVersion_10 Condition="'$(WindowsTargetPlatformVersion_10)' != '' and !$(WindowsTargetPlatformVersion_10.EndsWith('.0'))">$(WindowsTargetPlatformVersion_10).0</WindowsTargetPlatformVersion_10>
+
+      <WindowsTargetPlatformVersion>$(WindowsTargetPlatformVersion_10)</WindowsTargetPlatformVersion>
+
+      <!-- Default back to 10.0.10240.0 if the ARM version of the Win10 SDK is not installed -->
+      <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM' and !Exists('$(WindowsSdkInstallFolder_10)\Include\$(WindowsTargetPlatformVersion_10)\shared\ksarm.h')">10.0.10240.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
   <PropertyGroup>
-    <WindowsTargetPlatformVersion Condition="'$(Platform)'=='ARM'">10.0.10240.0</WindowsTargetPlatformVersion>
+    <!-- Unless indicated otherwise, statically link the C++ Runtime into ChakraCore.dll -->
+    <RuntimeLib Condition="'$(RuntimeLib)'==''">static_library</RuntimeLib>
 
-    <!-- Always use Platform SDK for core builds -->
-    <EventManifestXmlPath>$(WindowsSDK80Path)Include\um</EventManifestXmlPath>    
-  </PropertyGroup>    
+    <NtTargetVersion>$(NtTargetVersion_Win7)</NtTargetVersion>
+    <!-- On ARM we depend an API that was added in Win8 timeframe, specifically GetCurrentThreadLimits.
+         Note that for ARM we don't need to support running on Win7, so it's fine to require Win8 as minimum. -->
+    <NtTargetVersion Condition="'$(Platform)'=='ARM' or '$(Platform)'=='Arm64'">$(NtTargetVersion_Win8)</NtTargetVersion>
+  </PropertyGroup>
 </Project>

Build/Chakra.Build.Paths.props

@@ -8,6 +8,12 @@
     <BuildConfigPropsPath>$(MSBuildThisFileDirectory)</BuildConfigPropsPath>
 
     <ChakraBuildPathImported>true</ChakraBuildPathImported>
-
+  </PropertyGroup>
+  <PropertyGroup Label="ICU">
+    <!-- IcuLibDir can be set in environment or with "/p:IcuLibDir=..." -->
+    <IcuLibDir Condition="'$(IcuLibDir)'=='' AND '$(Configuration)'=='Debug'">$(ChakraCoreRootDirectory)\deps\static\icu-small\debug</IcuLibDir>
+    <IcuLibDir Condition="'$(IcuLibDir)'=='' AND ('$(Configuration)'=='Test' or '$(Configuration)'=='Release')">$(ChakraCoreRootDirectory)\deps\static\icu-small\release</IcuLibDir>
+    <!-- IcuIncludeDir can be set in environment or with "/p:IcuIncludeDir=..." -->
+    <IcuIncludeDir Condition="'$(IcuIncludeDir)'==''">$(ChakraCoreRootDirectory)\deps\icu-small\source</IcuIncludeDir>
   </PropertyGroup>
 </Project>

Build/Chakra.Build.props

@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="Common.Build.props"/>  
+  <Import Project="Common.Build.props"/>
   <PropertyGroup>
     <Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_Win7)'">0x0601</Win32_WinNTVersion>
     <Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_Win8)'">0x0602</Win32_WinNTVersion>
+    <Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_WinBlue)'">0x0603</Win32_WinNTVersion>
     <Win32_WinNTVersion Condition="'$(NtTargetVersion)'=='$(NtTargetVersion_Win10)'">0x0A00</Win32_WinNTVersion>
+
+    <!-- Always use Platform SDK for core builds -->
+    <EventManifestXmlPath Condition="'$(TargetPlatformVersion)'=='8.1'">$(WindowsSdkDir)Include\um</EventManifestXmlPath>
+    <EventManifestXmlPath Condition="'$(TargetPlatformVersion)'!='8.1'">$(WindowsSdkDir)Include\$(TargetPlatformVersion)\um</EventManifestXmlPath>
   </PropertyGroup>
   <PropertyGroup>
     <NoThrowNewLib>nothrownew.obj</NoThrowNewLib>
@@ -16,6 +21,7 @@
     <ClCompile>
       <PreprocessorDefinitions>
         %(PreprocessorDefinitions);
+        _CHAKRACOREBUILD;
         _WIN32_WINNT=$(Win32_WinNTVersion);
         WINVER=$(Win32_WinNTVersion);
         WIN32_LEAN_AND_MEAN=1
@@ -24,32 +30,48 @@
         %(PreprocessorDefinitions);
         DISABLE_JIT=1
       </PreprocessorDefinitions>
-      <PreprocessorDefinitions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">
+      <PreprocessorDefinitions Condition="'$(BuildScriptDebug)'=='false'">
+        %(PreprocessorDefinitions);
+        BUILD_WITHOUT_SCRIPT_DEBUG=1
+      </PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(BuildLite)'=='true'">
+        %(PreprocessorDefinitions);
+        CHAKRACORE_LITE
+      </PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(IntlICU)'=='true'">
         %(PreprocessorDefinitions);
-        BYTECODE_TESTING=1
+        INTL_ICU=1
       </PreprocessorDefinitions>
-      <!-- REVIEW: These are warning are introduced when moving to VS2015 tools, may want to clean these up -->
+      <PreprocessorDefinitions Condition="'$(ForceSWB)'=='true'">
+        %(PreprocessorDefinitions);
+        GLOBAL_ENABLE_WRITE_BARRIER=1
+      </PreprocessorDefinitions>
+      <PreprocessorDefinitions Condition="'$(NTDDIVersion)'!=''" >%(PreprocessorDefinitions);NTDDI_VERSION=$(NTDDIVersion)</PreprocessorDefinitions>
+      <!-- REVIEW: These warnings are introduced when moving to VS2015 tools, may want to clean these up -->
       <DisableSpecificWarnings>
         %(DisableSpecificWarnings);
         4458;     <!-- declaration of '' hides class member -->
         4312;     <!-- 'type cast': conversion from '' to '' of greater size -->
+        4800;     <!-- type' : forcing value to bool 'true' or 'false' (performance warning) [always off in 2017 by default, but warns in 2015 -->
       </DisableSpecificWarnings>
       <!-- Use the debug CRT in debug build -->
       <RuntimeLibrary Condition="'$(Configuration)'=='Debug' AND '$(RuntimeLib)'!='static_library'">MultiThreadedDebugDLL</RuntimeLibrary>
       <RuntimeLibrary Condition="'$(Configuration)'=='Debug' AND '$(RuntimeLib)'=='static_library'">MultiThreadedDebug</RuntimeLibrary>
       <AdditionalIncludeDirectories>
         $(ChakraCoreRootDirectory)\lib\common\placeholder;
+        $(IntDir)..\CoreManifests;
+        %(AdditionalIncludeDirectories)
+      </AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories Condition="'$(IntlICU)'=='true'">
+        $(IcuIncludeDir)\common;
+        $(IcuIncludeDir)\i18n;
         %(AdditionalIncludeDirectories)
       </AdditionalIncludeDirectories>
-
-      <!-- ======== For Code Coverage ======== -->
-      <Optimization Condition="'$(ENABLE_CODECOVERAGE)'=='true'">Disabled</Optimization>
     </ClCompile>
 
-    <Link>
-      <!-- ======== For Code Coverage ======== -->
-      <AdditionalOptions Condition="'$(ENABLE_CODECOVERAGE)'=='true'">%(AdditionalOptions) /DEBUGTYPE:CV,FIXUP</AdditionalOptions>
-    </Link>
+    <ResourceCompile>
+      <PreprocessorDefinitions>%(PreprocessorDefinitions);_CHAKRACOREBUILD</PreprocessorDefinitions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
 
   <!-- Link dependencies for projects that link with Chakra libraries -->
@@ -58,8 +80,12 @@
         oleaut32.lib;
         version.lib
     </ChakraCommonLinkDependencies>
+    <RLCommonLinkDependencies>
+        kernel32.lib;
+        ole32.lib
+    </RLCommonLinkDependencies>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(OptimizedBuild)'!='true'">
+  <PropertyGroup Condition="'$(DebugBuild)'=='true'">
     <ChakraCommonLinkDependencies>
         $(ChakraCommonLinkDependencies);
         dbghelp.lib;