---

yaml
---
r: 125408
b: refs/heads/try
c: 9513a4b
h: refs/heads/master
v: v3

Author: michaelwoerister

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 692077b6431460b96beb0ccf4f38299618d51db2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 9fc8394d3bce22ab483f98842434c84c396212ae
-refs/heads/try: f693f267c71a79c0c9bb723dd39ad14634ea4502
+refs/heads/try: 9513a4b046055d991ec27c30c0d3f6cf0f1dc40b
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/etc/lldb_batchmode.py

@@ -82,8 +82,6 @@ def execute_command(command_interpreter, command):
       if res.HasResult():
           print(normalize_whitespace(res.GetOutput()), end = '\n')
 
-      time.sleep(0.2)
-
       # If the command introduced any breakpoints, make sure to register them with the breakpoint
       # callback
       while len(new_breakpoints) > 0:
@@ -114,18 +112,18 @@ def start_breakpoint_listener(target):
   def listen():
     print_debug("Started listening...")
     event = lldb.SBEvent()
-    wait_count = 0
+    listening_start_time_secs = time.clock()
+    MAX_LISTENING_TIME_SECS = 10
     try:
-      while wait_count < 5:
+      while time.clock() < (listening_start_time_secs + MAX_LISTENING_TIME_SECS):
         if listener.WaitForEvent(1, event):
           if lldb.SBBreakpoint.EventIsBreakpointEvent(event) and \
              lldb.SBBreakpoint.GetBreakpointEventTypeFromEvent(event) == \
              lldb.eBreakpointEventTypeAdded:
             global new_breakpoints
             breakpoint = lldb.SBBreakpoint.GetBreakpointFromEvent(event)
             print_debug("breakpoint added (not really...), id = " + str(breakpoint.id))
-            # new_breakpoints.append(breakpoint.id)
-        wait_count += 1
+            new_breakpoints.append(breakpoint.id)
     except:
       print_debug("breakpoint listener shutting down")
 

branches/try/src/librustc/back/link.rs

@@ -1055,10 +1055,21 @@ fn link_rlib<'a>(sess: &'a Session,
             let bc_deflated = obj_filename.with_extension("bytecode.deflate");
             match fs::File::open(&bc).read_to_end().and_then(|data| {
                 fs::File::create(&bc_deflated)
-                    .write(match flate::deflate_bytes(data.as_slice()) {
-                        Some(compressed) => compressed,
-                        None => sess.fatal("failed to compress bytecode")
-                     }.as_slice())
+                    .write({
+                        let compressed = match flate::deflate_bytes(data.as_slice()) {
+                            Some(compressed) => compressed,
+                            None => sess.fatal("failed to compress bytecode")
+                        };
+
+                        let mut data_copy: Vec<u8> = Vec::with_capacity(compressed.as_slice().len() + 1);
+                        data_copy.push_all(compressed.as_slice());
+
+                        if compressed.as_slice().len() % 2 != 0 {
+                            data_copy.push(0u8);
+                        }
+
+                        data_copy
+                    }.as_slice())
             }) {
                 Ok(()) => {}
                 Err(e) => {