Issue 7364051: code review 7364051: exp/ssa: resolve botched merge.

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
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
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
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
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 7364051: code review 7364051: exp/ssa: resolve botched merge. (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
12 years ago by adonovan

Modified:
12 years ago

Reviewers:

CC:
gri, golang-dev

Visibility:
Public.

Description

exp/ssa: resolve botched merge. While submitting CL 7371051 I accidentally reverted much of CL 7395052. This change restores it.

Patch Set 1 #

Patch Set 2 : diff -r 865d2efc4bf0 https://code.google.com/p/go/ #

Patch Set 3 : diff -r 865d2efc4bf0 https://code.google.com/p/go/ #

Patch Set 4 : diff -r 37d391191e3f https://code.google.com/p/go/ #

Patch Set 5 : diff -r 37d391191e3f https://code.google.com/p/go/ #

Created: 12 years ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+91 lines, -78 lines)			Patch
	M	src/pkg/exp/ssa/builder.go	View	1 2 3	6 chunks	+90 lines, -76 lines	0 comments	Download
	M	src/pkg/exp/ssa/promote.go	View	1 2	2 chunks	+1 line, -2 lines	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

adonovan

Hello gri, gri@golang.org (cc: golang-dev@googlegroups.com), I'd like you to review this change to https://code.google.com/p/go/

12 years ago (2013-02-27 16:39:36 UTC) #1

adonovan

12 years ago (2013-02-27 16:39:42 UTC) #2

*** Submitted as https://code.google.com/p/go/source/detail?r=f3e8dfc67e45 ***

exp/ssa: resolve botched merge.

While submitting CL 7371051 I accidentally reverted much of CL
7395052.  This change restores it.

R=gri
TBR=gri
CC=golang-dev
https://codereview.appspot.com/7364051

Expand All Messages | Collapse All Messages