lib/Transforms/NaCl/ExpandCtors.cpp - Issue 1151093004: Changes from 3.7 merge to files not in upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: lib/Transforms/NaCl/ExpandCtors.cpp

Issue 1151093004: Changes from 3.7 merge to files not in upstream (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-llvm.git@master

Patch Set: Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp ('K') | « lib/Transforms/NaCl/ConstantInsertExtractElementIndex.cpp ('k') | lib/Transforms/NaCl/ExpandI64.cpp » ('j') | lib/Transforms/NaCl/FixVectorLoadStoreAlignment.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: lib/Transforms/NaCl/ExpandCtors.cpp

diff --git a/lib/Transforms/NaCl/ExpandCtors.cpp b/lib/Transforms/NaCl/ExpandCtors.cpp

index a8d8bbfd37da1028bdfd8b8871f79c42f9b4d530..97398870b4006b9a881fb2852cb861c065dfd66d 100644

--- a/lib/Transforms/NaCl/ExpandCtors.cpp

+++ b/lib/Transforms/NaCl/ExpandCtors.cpp

@@ -135,7 +135,7 @@ static void defineFuncArray(Module &M, const char *LlvmArrayName,

// does not generate correct code when a GlobalAlias contains a

// GetElementPtr ConstantExpr.

Constant *NewArrayEnd =

- ConstantExpr::getGetElementPtr(NewArray,

+ ConstantExpr::getGetElementPtr(ArrayTy, NewArray,

ConstantInt::get(M.getContext(),

APInt(32, 1)));

setGlobalVariableValue(M, EndSymbol, NewArrayEnd);