Skip to content

Commit

Permalink
Version 4.3.61.18 (cherry-pick)
Browse files Browse the repository at this point in the history
Merged 3fa1b60

Fix AIX compiler warning

R=machenbach@chromium.org, svenpanne@chromium.org
BUG=

Review URL: https://codereview.chromium.org/1128343002

Cr-Commit-Position: refs/branch-heads/4.3@{crosswalk-project#21}
Cr-Branched-From: f5c0a23-refs/heads/4.3.61@{#1}
Cr-Branched-From: 0a7d4f4-refs/heads/master@{#27508}
  • Loading branch information
mhdawson committed May 7, 2015
1 parent d0ea36b commit db7b695
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion include/v8-version.h
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
#define V8_MAJOR_VERSION 4
#define V8_MINOR_VERSION 3
#define V8_BUILD_NUMBER 61
#define V8_PATCH_LEVEL 17
#define V8_PATCH_LEVEL 18

// Use 1 for candidates and 0 otherwise.
// (Boolean macro values are not supported by all preprocessors.)
Expand Down
2 changes: 1 addition & 1 deletion src/heap/heap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3754,7 +3754,7 @@ AllocationResult Heap::CopyCode(Code* code) {
new_constant_pool = empty_constant_pool_array();
}

HeapObject* result;
HeapObject* result = NULL;
// Allocate an object the same size as the code object.
int obj_size = code->Size();
allocation = AllocateRaw(obj_size, CODE_SPACE, CODE_SPACE);
Expand Down

0 comments on commit db7b695

Please sign in to comment.