Skip to content

Commit f29a3a8

Browse files
curtismancurtisman
committed
Minor change to avoid relative include path in source
Change synced from internal branch Also includes: - change some Assert to AnalysisAssert to provide prefast with more clues. - Add UTF-8 BOM to some files
1 parent d2592e1 commit f29a3a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+120
-83
lines changed

‎Build/Chakra.Core.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Microsoft Visual Studio Solution File, Format Version 12.00
1+
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 14
33
VisualStudioVersion = 14.0.23107.0
44
MinimumVisualStudioVersion = 10.0.40219.1

‎bin/ChakraCore/ChakraCore.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
$(ChakraCoreRootDirectory)Lib\Common;
2626
$(ChakraCoreRootDirectory)Lib\Parser;
2727
$(ChakraCoreRootDirectory)Lib\Runtime;
28+
$(ChakraCoreRootDirectory)Lib\Runtime\ByteCode;
2829
$(ChakraCoreRootDirectory)Lib\Jsrt;
2930
$(IntDir);
3031
%(AdditionalIncludeDirectories);

‎bin/ch/ch.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />

‎bin/rl/rl.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
@@ -36,7 +36,7 @@
3636
<ClCompile Include="$(MSBuildThisFileDirectory)rlmp.cpp" />
3737
<ClCompile Include="$(MSBuildThisFileDirectory)rlrun.cpp" />
3838
<ClCompile Include="$(MSBuildThisFileDirectory)rlregr.cpp" />
39-
<ClCompile Include="$(MSBuildThisFileDirectory)xmlreader.cpp" />
39+
<ClCompile Include="$(MSBuildThisFileDirectory)xmlreader.cpp" />
4040
</ItemGroup>
4141
<ItemGroup>
4242
<ClInclude Include="rl.h" />

‎lib/Backend/Chakra.Backend.vcxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
@@ -29,6 +29,8 @@
2929
$(MSBuildThisFileDirectory)\$(PlatformPathNameAlt);
3030
$(MSBuildThisFileDirectory)..\Common;
3131
$(MSBuildThisFileDirectory)..\Runtime;
32+
$(MSBuildThisFileDirectory)..\Runtime\ByteCode;
33+
$(MSBuildThisFileDirectory)..\Runtime\Math;
3234
$(MSBuildThisFileDirectory)..\Parser;
3335
%(AdditionalIncludeDirectories)
3436
</AdditionalIncludeDirectories>

‎lib/Backend/Chakra.Backend.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="$(MSBuildThisFileDirectory)AgenPeeps.cpp" />

‎lib/Backend/Encoder.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,14 +840,15 @@ Encoder::ShortenBranchesAndLabelAlign(BYTE **codeStart, ptrdiff_t *codeSize)
840840
}
841841

842842
src_size = to - from + 1;
843-
Assert(dst_size >= src_size);
843+
AnalysisAssert(dst_size >= src_size);
844844

845845
memcpy_s(dst_p, dst_size, from, src_size);
846846
dst_p += src_size;
847847
dst_size -= src_size;
848848

849849
// fix the BR
850850
// write new opcode
851+
AnalysisAssert(dst_p < tmpBuffer + newCodeSize);
851852
*dst_p = (*opcodeByte == 0xe9) ? (BYTE)0xeb : (BYTE)(*opcodeByte - 0x10);
852853
dst_p += 2; // 1 byte for opcode + 1 byte for imm8
853854
dst_size -= 2;

‎lib/Backend/GlobOpt.cpp

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6010,7 +6010,6 @@ GlobOpt::CopyProp(IR::Opnd *opnd, IR::Instr *instr, Value *val, IR::IndirOpnd *p
60106010
return opnd;
60116011
}
60126012

6013-
// SIMD_JS
60146013
// Don't copy-prop operand of SIMD instr with ExtendedArg operands. Each instr should have its exclusive EA sequence.
60156014
if (
60166015
Js::IsSimd128Opcode(instr->m_opcode) &&
@@ -21023,9 +21022,9 @@ GlobOpt::InspectInstrForMemCopyCandidate(Loop* loop, IR::Instr* instr, MemCopyEm
2102321022

2102421023
// The caller is responsible to free the memory allocated between inOrderEmitData[iEmitData -> end]
2102521024
bool
21026-
GlobOpt::ValidateMemOpCandidates(Loop * loop, MemOpEmitData** inOrderEmitData, int& iEmitData)
21025+
GlobOpt::ValidateMemOpCandidates(Loop * loop, _Out_writes_(iEmitData) MemOpEmitData** inOrderEmitData, int& iEmitData)
2102721026
{
21028-
Assert(iEmitData >= (int)loop->memOpInfo->candidates->Count());
21027+
AnalysisAssert(iEmitData == (int)loop->memOpInfo->candidates->Count());
2102921028
// We iterate over the second block of the loop only. MemOp Works only if the loop has exactly 2 blocks
2103021029
Assert(loop->blockList.HasTwo());
2103121030

@@ -21104,10 +21103,16 @@ GlobOpt::ValidateMemOpCandidates(Loop * loop, MemOpEmitData** inOrderEmitData, i
2110421103
}
2110521104
if (candidateFound)
2110621105
{
21107-
Assert(iEmitData > 0);
21106+
AnalysisAssert(iEmitData > 0);
21107+
if (iEmitData == 0)
21108+
{
21109+
// Explicit for OACR
21110+
break;
21111+
}
2110821112
inOrderEmitData[--iEmitData] = emitData;
2110921113
candidate = nullptr;
2111021114
emitData = nullptr;
21115+
2111121116
}
2111221117
} NEXT_INSTR_BACKWARD_IN_BLOCK;
2111321118

@@ -21173,3 +21178,4 @@ GlobOpt::ProcessMemOp()
2117321178
}
2117421179
} NEXT_LOOP_EDITING;
2117521180
}
21181+

‎lib/Backend/GlobOpt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1443,7 +1443,7 @@ class GlobOpt
14431443
void ProcessMemOp();
14441444
bool InspectInstrForMemSetCandidate(Loop* loop, IR::Instr* instr, struct MemSetEmitData* emitData, bool& errorInInstr);
14451445
bool InspectInstrForMemCopyCandidate(Loop* loop, IR::Instr* instr, struct MemCopyEmitData* emitData, bool& errorInInstr);
1446-
bool ValidateMemOpCandidates(Loop * loop, struct MemOpEmitData** emitData, int& iEmitData);
1446+
bool ValidateMemOpCandidates(Loop * loop, _Out_writes_(iEmitData) struct MemOpEmitData** emitData, int& iEmitData);
14471447
void HoistHeadSegmentForMemOp(IR::Instr *instr, IR::ArrayRegOpnd *arrayRegOpnd, IR::Instr *insertBeforeInstr);
14481448
void EmitMemop(Loop * loop, LoopCount *loopCount, const struct MemOpEmitData* emitData);
14491449
IR::Opnd* GenerateInductionVariableChangeForMemOp(Loop *loop, byte unroll, IR::Instr *insertBeforeInstr = nullptr);

‎lib/Backend/IRBuilder.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -585,7 +585,7 @@ IRBuilder::Build()
585585
}
586586
else
587587
{
588-
Js::OpCode op =
588+
Js::OpCode op =
589589
m_func->DoStackScopeSlots() ? Js::OpCode::NewStackScopeSlots : Js::OpCode::NewScopeSlots;
590590

591591
IR::Opnd * srcOpnd = IR::IntConstOpnd::New(
@@ -1483,7 +1483,7 @@ IRBuilder::BuildReg1(Js::OpCode newOpcode, uint32 offset, Js::RegSlot R0)
14831483
Js::Throw::FatalInternalError();
14841484
}
14851485
srcOpnd = BuildSrcOpnd(m_func->GetJnFunction()->GetLocalClosureReg());
1486-
isNotInt = true;
1486+
isNotInt = true;
14871487
break;
14881488

14891489
case Js::OpCode::LdLocalObj:
@@ -1696,7 +1696,7 @@ IRBuilder::BuildReg2(Js::OpCode newOpcode, uint32 offset, Js::RegSlot R0, Js::Re
16961696
case Js::OpCode::LdLetHeapArguments:
16971697
{
16981698
IR::Opnd * opndFrameObj;
1699-
if (m_func->GetJnFunction()->HasScopeObject() &&
1699+
if (m_func->GetJnFunction()->HasScopeObject() &&
17001700
src1Opnd->m_sym->m_instrDef &&
17011701
src1Opnd->m_sym->m_instrDef->m_opcode == Js::OpCode::LdPropIds)
17021702
{
@@ -1710,7 +1710,7 @@ IRBuilder::BuildReg2(Js::OpCode newOpcode, uint32 offset, Js::RegSlot R0, Js::Re
17101710
m_func->GetScriptContext()->GetLibrary()->GetNull(), IR::AddrOpndKindDynamicVar, m_func, true);
17111711
}
17121712
IR::RegOpnd * dstOpnd = BuildDstOpnd(R0);
1713-
IR::Instr * instr = IR::Instr::New(newOpcode, dstOpnd, opndFrameObj, src1Opnd, m_func);
1713+
IR::Instr * instr = IR::Instr::New(newOpcode, dstOpnd, opndFrameObj, src1Opnd, m_func);
17141714
this->AddInstr(instr, offset);
17151715
StackSym * dstSym = dstOpnd->m_sym;
17161716
if (dstSym->m_isSingleDef)
@@ -3444,8 +3444,8 @@ IRBuilder::BuildElementSlotI1(Js::OpCode newOpcode, uint32 offset, Js::RegSlot r
34443444
instr = IR::Instr::New(newOpcode, regOpnd, fieldOpnd, m_func);
34453445
}
34463446
this->AddInstr(instr, offset);
3447-
break;
3448-
3447+
break;
3448+
34493449
case Js::OpCode::StLocalSlot:
34503450
case Js::OpCode::StLocalSlotChkUndecl:
34513451

@@ -4569,7 +4569,7 @@ IRBuilder::BuildElementU(Js::OpCode newOpcode, uint32 offset, Js::RegSlot instan
45694569
regOpnd = BuildDstOpnd(instance);
45704570
instr = IR::Instr::New(newOpcode, regOpnd, fieldSymOpnd, m_func);
45714571
break;
4572-
4572+
45734573
default:
45744574
{
45754575
fieldSymOpnd = this->BuildFieldOpnd(newOpcode, instance, propertyId, propertyIdIndex, PropertyKindData);
@@ -4662,7 +4662,7 @@ IRBuilder::BuildAuxNoReg(Js::OpCode newOpcode, uint32 offset)
46624662
Fatal();
46634663
break;
46644664
}
4665-
}
4665+
}
46664666
}
46674667

46684668
void

‎lib/Parser/Chakra.Parser.vcxproj

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
@@ -23,6 +23,9 @@
2323
<AdditionalIncludeDirectories>
2424
$(MSBuildThisFileDirectory)..\Common;
2525
$(MSBuildThisFileDirectory)..\Backend;
26+
$(MSBuildThisFileDirectory)..\Runtime;
27+
$(MSBuildThisFileDirectory)..\Runtime\ByteCode;
28+
$(ChakraManifestsIncludeDirectory);
2629
%(AdditionalIncludeDirectories)
2730
</AdditionalIncludeDirectories>
2831
<PrecompiledHeader>Use</PrecompiledHeader>
@@ -118,7 +121,12 @@
118121
<PreprocessToFile>true</PreprocessToFile>
119122
<PreprocessSuppressLineNumbers>true</PreprocessSuppressLineNumbers>
120123
<ObjectFileName>$(IntDir)jserr.rc2</ObjectFileName>
121-
<AdditionalIncludeDirectories>$(MSBuildThisFileDirectory);$(MSBuildThisFileDirectory)..\Common</AdditionalIncludeDirectories>
124+
<AdditionalIncludeDirectories>
125+
$(MSBuildThisFileDirectory);
126+
$(MSBuildThisFileDirectory)..\Common;
127+
$(MSBuildThisFileDirectory)..\runtime;
128+
$(MSBuildThisFileDirectory)..\runtime\library;
129+
</AdditionalIncludeDirectories>
122130
<LibCompiled>false</LibCompiled>
123131
<ForcedIncludeFiles>
124132
</ForcedIncludeFiles>

‎lib/Parser/ParserPch.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
#include "RegexPattern.h"
2222

2323
// Runtime includes
24-
#include "..\Runtime\runtime.h"
25-
#include "..\Runtime\ByteCode\Symbol.h"
26-
#include "..\Runtime\ByteCode\Scope.h"
27-
#include "..\Runtime\ByteCode\FuncInfo.h"
28-
#include "..\Runtime\ByteCode\ScopeInfo.h"
24+
#include "runtime.h"
25+
#include "ByteCode\Symbol.h"
26+
#include "ByteCode\Scope.h"
27+
#include "ByteCode\FuncInfo.h"
28+
#include "ByteCode\ScopeInfo.h"

‎lib/Parser/parse.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11160,7 +11160,7 @@ void Parser::ParseDestructuredLiteralWithScopeSave(tokens declarationType,
1116011160
DestructuringInitializerContext initializerContext/* = DIC_None*/,
1116111161
bool allowIn /*= true*/)
1116211162
{
11163-
// We are going to parse the text again to validate the current grammar as Destructuring. Saving some scopes and
11163+
// We are going to parse the text again to validate the current grammar as Destructuring. Saving some scopes and
1116411164
// AST related information before the validation parsing and later they will be restored.
1116511165

1116611166
ParseNodePtr pnodeFncSave = m_currentNodeFunc;

‎lib/Runtime/Base/Chakra.Runtime.Base.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
$(MSBuildThisFileDirectory)..;
2525
$(MSBuildThisFileDirectory)..\..\Common;
2626
$(MSBuildThisFileDirectory)..\..\Parser;
27+
$(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
2728
$(MSBuildThisFileDirectory)..\..\Backend;
2829
%(AdditionalIncludeDirectories)
2930
</AdditionalIncludeDirectories>

‎lib/Runtime/Base/PropertyRecord.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ namespace Js
6060
// Initialize all Internal property records
6161
#define INTERNALPROPERTY(name) \
6262
const BuiltInPropertyRecord<1> InternalPropertyRecords::name = { PropertyRecord((PropertyId)InternalPropertyIds::name, (uint)InternalPropertyIds::name, false, 0, false), L"" };
63-
#include "..\InternalPropertyList.h"
63+
#include "InternalPropertyList.h"
6464

6565
const PropertyRecord* InternalPropertyRecords::GetInternalPropertyName(PropertyId propertyId)
6666
{
@@ -71,7 +71,7 @@ namespace Js
7171
#define INTERNALPROPERTY(name) \
7272
case InternalPropertyIds::name: \
7373
return InternalPropertyRecords::name;
74-
#include "..\InternalPropertyList.h"
74+
#include "InternalPropertyList.h"
7575
}
7676

7777
Throw::FatalInternalError();

‎lib/Runtime/Base/PropertyRecord.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ namespace Js
125125
{
126126
public:
127127
#define INTERNALPROPERTY(n) const static BuiltInPropertyRecord<1> n;
128-
#include "..\InternalPropertyList.h"
128+
#include "InternalPropertyList.h"
129129

130130
static const PropertyRecord* GetInternalPropertyName(PropertyId propertyId);
131131
};

‎lib/Runtime/Base/ScriptContext.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -565,7 +565,7 @@ namespace Js
565565
uint byteCodeDataSize;
566566
uint byteCodeAuxiliaryDataSize;
567567
uint byteCodeAuxiliaryContextDataSize;
568-
uint byteCodeHistogram[OpCode::ByteCodeLast];
568+
uint byteCodeHistogram[static_cast<uint>(OpCode::ByteCodeLast)];
569569
uint32 forinCache;
570570
uint32 forinNoCache;
571571
#endif

‎lib/Runtime/Base/ThreadContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void (*InitializeAdditionalProperties)(ThreadContext *threadContext) = DefaultIn
5656
// To make sure the marker function doesn't get inlined, optimized away, or merged with other functions we disable optimization.
5757
// If this method ends up causing a perf problem in the future, we should replace it with asm versions which should be lighter.
5858
#pragma optimize("g", off)
59-
extern "C" void* MarkerForExternalDebugStep()
59+
__declspec(noinline) extern "C" void* MarkerForExternalDebugStep()
6060
{
6161
// We need to return something here to prevent this function from being merged with other empty functions by the linker.
6262
static int __dummy;

‎lib/Runtime/ByteCode/ByteCodeEmitter.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2450,7 +2450,7 @@ void ByteCodeGenerator::EmitInternalScopeObjInit(FuncInfo *funcInfo, Scope *scop
24502450
{
24512451
uint cacheId = funcInfo->FindOrAddInlineCacheId(scopeLocation, propertyId, false, true);
24522452
this->m_writer.PatchableProperty(opcode, valueLocation, scopeLocation, cacheId);
2453-
}
2453+
}
24542454
}
24552455

24562456
void ByteCodeGenerator::GetEnclosingNonLambdaScope(FuncInfo *funcInfo, Scope * &scope, Js::PropertyId &envIndex)
@@ -5072,7 +5072,7 @@ void ByteCodeGenerator::EmitTypeOfFld(FuncInfo * funcInfo, Js::PropertyId proper
50725072
cacheId = funcInfo->FindOrAddInlineCacheId(instance, propertyId, false, false);
50735073
this->Writer()->ElementP(ldFldOp, tmpReg, cacheId);
50745074
break;
5075-
5075+
50765076
default:
50775077
cacheId = funcInfo->FindOrAddInlineCacheId(instance, propertyId, false, false);
50785078
this->Writer()->PatchableProperty(ldFldOp, tmpReg, instance, cacheId);
@@ -10497,7 +10497,7 @@ void Emit(ParseNode *pnode, ByteCodeGenerator *byteCodeGenerator, FuncInfo *func
1049710497
Assert(scope->GetMustInstantiate());
1049810498
if (scope->GetIsObject())
1049910499
{
10500-
Js::OpCode op = (sym->GetDecl()->nop == knopLetDecl) ? Js::OpCode::InitUndeclLetFld :
10500+
Js::OpCode op = (sym->GetDecl()->nop == knopLetDecl) ? Js::OpCode::InitUndeclLetFld :
1050110501
byteCodeGenerator->GetInitFldOp(scope, scope->GetLocation(), funcInfo, false);
1050210502

1050310503
Js::PropertyId propertyId = sym->EnsurePosition(byteCodeGenerator);

‎lib/Runtime/ByteCode/ByteCodeWriter.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1915,7 +1915,7 @@ namespace Js
19151915
{
19161916
OpCodeUtil::ConvertNonCallOpToProfiled(op);
19171917
}
1918-
break;
1918+
break;
19191919

19201920
case OpCode::LdLocalMethodFld:
19211921
if (registerCacheIdForCall)

‎lib/Runtime/ByteCode/Chakra.Runtime.ByteCode.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<ClCompile Include="$(MSBuildThisFileDirectory)RuntimeByteCodePch.cpp">
5353
<PrecompiledHeader>Create</PrecompiledHeader>
5454
</ClCompile>
55-
<ClCompile Include="BackEndOpcodeAttr.cpp" />
55+
<ClCompile Include="$(MSBuildThisFileDirectory)BackEndOpcodeAttr.cpp" />
5656
</ItemGroup>
5757
<ItemGroup>
5858
<ClInclude Include="AsmJSByteCodeDumper.h" />

‎lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
@@ -28,6 +28,7 @@
2828
$(MSBuildThisFileDirectory)..;
2929
$(MSBuildThisFileDirectory)..\..\Common;
3030
$(MSBuildThisFileDirectory)..\..\Parser;
31+
$(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
3132
$(MSBuildThisFileDirectory)..\..\Backend;
3233
$(MSBuildThisFileDirectory)..\..\Language;
3334
%(AdditionalIncludeDirectories)

‎lib/Runtime/Debug/Chakra.Runtime.Debug.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="$(MsBuildThisFileDirectory)DebugContext.cpp" />

‎lib/Runtime/Language/AsmJSEncoder.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#ifndef TEMP_DISABLE_ASMJS
88

9-
#include "..\Backend\CodeGenAllocators.h"
9+
#include "CodeGenAllocators.h"
1010
#ifdef DBG_DUMP
1111
#include "ByteCode\ByteCodeDumper.h"
1212
#include "ByteCode\AsmJSByteCodeDumper.h"

‎lib/Runtime/Language/Chakra.Runtime.Language.vcxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition="'$(ChakraBuildPathImported)'!='true'" Project="$(SolutionDir)Chakra.Build.Paths.props" />
44
<Import Project="$(BuildConfigPropsPath)Chakra.Build.ProjectConfiguration.props" />
@@ -29,6 +29,8 @@
2929
$(MSBuildThisFileDirectory)..\..\Common;
3030
$(MSBuildThisFileDirectory)..\..\Parser;
3131
$(MSBuildThisFileDirectory)..\..\Backend;
32+
$(MSBuildThisFileDirectory)..\..\Runtime\Math;
33+
$(MSBuildThisFileDirectory)..\..\Runtime\ByteCode;
3234
%(AdditionalIncludeDirectories)
3335
</AdditionalIncludeDirectories>
3436
<PrecompiledHeader>Use</PrecompiledHeader>

‎lib/Runtime/Language/Chakra.Runtime.Language.vcxproj.filters

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
1+
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup>
44
<ClCompile Include="$(MsBuildThisFileDirectory)..\StdAfx.cpp" />

‎lib/Runtime/Language/JavascriptMathOperators.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
//-------------------------------------------------------------------------------------------------------
55
#pragma once
66

7-
#include "..\Math\JavascriptMath.h"
8-
#include "..\Math\AsmJsMath.h"
7+
#include "JavascriptMath.h"
8+
#include "AsmJsMath.h"
99

0 commit comments

Comments
 (0)