Jon Ross-Perkins 0001f53ec1 Implement merging of conflicts found during import. (#3819) ...

Note we only identify conflicts between libraries in the current package
during import.

This restructures the BUILD because of dependency cycles between cpp
files... We're going to need context's name lookup to handle things such
as merging, merging requires function logic, function logic requires
context access. Per discussion, going with a single large cc_library for
now rather than trying to split out small libraries.

I'm envisioning the new merge.* as a hub for cross-declaration merge
logic. Note function.cpp is already pretty sizable, and I think it may
lean a little function-specific even if there are some utilities that
could be split out.

2024-03-27 23:38:10 +00:00

..

alias

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

array

Add infrastructure for distinguishing between signed and unsigned integer types. (#3822)

2024-03-27 20:18:25 +00:00

as

Remove special-case formatting for class and interface LHS. (#3744)

2024-03-06 23:32:33 +00:00

basics

Convert literals to i32 when forming an i32-typed int_literal instruction. (#3814)

2024-03-26 19:56:11 +00:00

builtins

Add infrastructure for distinguishing between signed and unsigned integer types. (#3822)

2024-03-27 20:18:25 +00:00

class

Provide locations for indirectly imported instructions. (#3811)

2024-03-27 23:25:41 +00:00

const

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

eval

Convert literals to i32 when forming an i32-typed int_literal instruction. (#3814)

2024-03-26 19:56:11 +00:00

expr_category

If a SemIR instruction has a braced block and a constant value, print the constant value first. (#3734)

2024-02-29 23:51:32 +00:00

function

Implement merging of conflicts found during import. (#3819)

2024-03-27 23:38:10 +00:00

global

Remove special-case formatting for class and interface LHS. (#3744)

2024-03-06 23:32:33 +00:00

if

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

if_expr

Convert literals to i32 when forming an i32-typed int_literal instruction. (#3814)

2024-03-26 19:56:11 +00:00

impl

Allow simple uses of Self in impls. (#3824)

2024-03-27 22:52:45 +00:00

index

Convert literals to i32 when forming an i32-typed int_literal instruction. (#3814)

2024-03-26 19:56:11 +00:00

interface

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

ir

If a SemIR instruction has a braced block and a constant value, print the constant value first. (#3734)

2024-02-29 23:51:32 +00:00

let

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

namespace

Implement merging of conflicts found during import. (#3819)

2024-03-27 23:38:10 +00:00

operators

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

package_expr

Change Namespace formatting to use the scope's name. (#3782)

2024-03-14 21:12:26 +00:00

packages

Implement merging of conflicts found during import. (#3819)

2024-03-27 23:38:10 +00:00

pointer

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

return

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

struct

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

tuples

Remove special-case formatting for class and interface LHS. (#3744)

2024-03-06 23:32:33 +00:00

var

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00

while

Print a blank line after a diagnostic. (#3806)

2024-03-22 18:10:49 +00:00